summaryrefslogtreecommitdiff
path: root/source3/printing
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2005-05-27 20:34:19 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:57:01 -0500
commiteb8b02104ecec92063377b156f44a838af944cef (patch)
tree191b8d5ee540154d104b4b9013ed9004a8734d33 /source3/printing
parent96f179752d338b9958f645e769e562c43e8eb156 (diff)
downloadsamba-eb8b02104ecec92063377b156f44a838af944cef.tar.gz
samba-eb8b02104ecec92063377b156f44a838af944cef.tar.bz2
samba-eb8b02104ecec92063377b156f44a838af944cef.zip
r7041: compile fixes....long day I guess
(This used to be commit ec3ef5ddbe12fa6ebe8f58979625c671d181c519)
Diffstat (limited to 'source3/printing')
-rw-r--r--source3/printing/nt_printing.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 552d2dfe35..caacfef48f 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -354,7 +354,7 @@ static int sec_desc_upg_fn( TDB_CONTEXT *the_tdb, TDB_DATA key,
/* create a new SEC_DESC with the appropriate owner and group SIDs */
string_to_sid(&sid, "S-1-5-32-544" );
- new_sec = make_sec_desc( ctx, SEC_DESC_REVISION,
+ new_sec = make_sec_desc( ctx, SEC_DESC_REVISION, SEC_DESC_SELF_RELATIVE,
&sid, &sid,
NULL, NULL, &size_new_sec );
sd_new = make_sec_desc_buf( ctx, size_new_sec, new_sec );
@@ -396,7 +396,7 @@ static BOOL upgrade_to_version_4(void)
DEBUG(0,("upgrade_to_version_4: upgrading printer security descriptors\n"));
- if ( !(ctx = talloc_init_named( "upgrade_to_version_4" )) )
+ if ( !(ctx = talloc_init( "upgrade_to_version_4" )) )
return False;
result = tdb_traverse( tdb_printers, sec_desc_upg_fn, ctx );
@@ -415,6 +415,7 @@ BOOL nt_printing_init(void)
static pid_t local_pid;
const char *vstring = "INFO/version";
WERROR win_rc;
+ uint32 vers_id;
if (tdb_drivers && tdb_printers && tdb_forms && local_pid == sys_getpid())
return True;