Makefile.in: Added maintainer mode fixes.

aclocal.m4: Added AC_LIBTESTFUNC.
configure.in: Fixed -lsecurity -lsec problems.
client.c: dos_ fixes.
groupdb/aliasunix.c: Dead code removal.
include/includes.h: Added default PRINTCAP_NAME.
lib/genrand.c: dos_ fixes.
lib/replace.c: Added strtoul.
lib/system.c: dos_ fixes.
lib/util.c: dos_ fixes.
lib/util_sid.c: Signed/unsigned fixes.
lib/util_str.c: removed bad const.
locking/locking_slow.c: dos_ fixes.
printing/printing.c: dos_ fixes.
rpc_server/srv_samr.c: Dead code removal.
rpc_server/srv_sid.c: global_myworkgroup defined with wrong size AGAIN !
smbd/dir.c: dos_ fixes.
smbd/open.c: dos_ fixes.
smbd/oplock.c: dos_ fixes.
smbd/reply.c smbd/server.c smbd/service.c smbd/uid.c: dos_ fixes.

Jeremy.
(This used to be commit 6acb4b68f68d516e2ac3c47e500f5600d653435e)

1 files changed, 5 insertions, 5 deletions

diff --git a/source3/lib/util_sid.c b/source3/lib/util_sid.c
index a483f85b84..8741479067 100644
--- a/source3/lib/util_sid.c
+++ b/source3/lib/util_sid.c
@@ -39,11 +39,11 @@ char *sid_to_string(pstring sidstr_out, DOM_SID *sid)
               (sid->id_auth[3] << 16) +
               (sid->id_auth[2] << 24);
 
-  slprintf(sidstr_out, sizeof(pstring) - 1, "S-%d-%d", sid->sid_rev_num, ia);
+  slprintf(sidstr_out, sizeof(pstring) - 1, "S-%u-%lu", (unsigned int)sid->sid_rev_num, (unsigned long)ia);
 
   for (i = 0; i < sid->num_auths; i++)
   {
-    slprintf(subauth, sizeof(subauth)-1, "-%u", sid->sub_auths[i]);
+    slprintf(subauth, sizeof(subauth)-1, "-%lu", (unsigned long)sid->sub_auths[i]);
     pstrcat(sidstr_out, subauth);
   }
 
@@ -76,7 +76,7 @@ BOOL string_to_sid(DOM_SID *sidout, char *sidstr)
   }
 
   /* Get the revision number. */
-  sidout->sid_rev_num = atoi(tok);
+  sidout->sid_rev_num = (uint8)strtoul(tok,NULL,10);
 
   if (!next_token(&p, tok, "-", sizeof(tok))) {
     DEBUG(0,("string_to_sid: Sid %s is not in a valid format.\n", sidstr));
@@ -84,7 +84,7 @@ BOOL string_to_sid(DOM_SID *sidout, char *sidstr)
   }
 
   /* identauth in decimal should be <  2^32 */
-  ia = atoi(tok);
+  ia = (uint32)strtoul(tok,NULL,10);
 
   /* NOTE - the ia value is in big-endian format. */
   sidout->id_auth[0] = 0;
@@ -104,7 +104,7 @@ BOOL string_to_sid(DOM_SID *sidout, char *sidstr)
      * are converted to little-endian when linearized onto the wire.
      */
 	uint32 rid = (uint32)strtoul(tok, NULL, 10);
-	DEBUG(50,("string_to_sid: tok: %s rid 0x%x\n", tok, rid));
+	DEBUG(50,("string_to_sid: tok: %s rid 0x%lx\n", tok, (unsigned long)rid));
 	sid_append_rid(sidout, rid);
   }