From: Gerald Carter <jerry@samba.org>
Date: Thu, 17 Feb 2005 15:17:16 +0000 (+0000)
Subject: r5431: couple of cimpile fixes from Jason Mader <jason@ncac.gwu.edu> -- BUGS 2341... 
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~5257
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0edcfc7fa20fd8e3273b29c8f1a97cb7c7179fb6;p=thirdparty%2Fsamba.git

r5431: couple of cimpile fixes from Jason Mader <jason@ncac.gwu.edu> -- BUGS 2341 & 2342
---

diff --git a/source/auth/auth_util.c b/source/auth/auth_util.c
index 7a186f65cdd..f3c01a58ca6 100644
--- a/source/auth/auth_util.c
+++ b/source/auth/auth_util.c
@@ -61,7 +61,6 @@ static int smb_create_user(const char *domain, const char *unix_username, const
 
 void auth_add_user_script(const char *domain, const char *username)
 {
-	uint32 rid;
 	/*
 	 * User validated ok against Domain controller.
 	 * If the admin wants us to try and create a UNIX
@@ -79,7 +78,6 @@ void auth_add_user_script(const char *domain, const char *username)
 		   
 		if ( !winbind_create_user(username, NULL) ) {
 			DEBUG(5,("auth_add_user_script: winbindd_create_user() failed\n"));
-			rid = 0;
 		}
 	}
 }
diff --git a/source/lib/util_unistr.c b/source/lib/util_unistr.c
index bb9d69b164d..55a21ebcbbc 100644
--- a/source/lib/util_unistr.c
+++ b/source/lib/util_unistr.c
@@ -454,16 +454,20 @@ smb_ucs2_t *strnrchr_w(const smb_ucs2_t *s, smb_ucs2_t c, unsigned int n)
 smb_ucs2_t *strstr_w(const smb_ucs2_t *s, const smb_ucs2_t *ins)
 {
 	smb_ucs2_t *r;
-	size_t slen, inslen;
+	size_t inslen;
+
+	if (!s || !*s || !ins || !*ins) 
+		return NULL;
 
-	if (!s || !*s || !ins || !*ins) return NULL;
-	slen = strlen_w(s);
 	inslen = strlen_w(ins);
 	r = (smb_ucs2_t *)s;
+
 	while ((r = strchr_w(r, *ins))) {
-		if (strncmp_w(r, ins, inslen) == 0) return r;
+		if (strncmp_w(r, ins, inslen) == 0) 
+			return r;
 		r++;
 	}
+
 	return NULL;
 }
 
@@ -736,16 +740,20 @@ smb_ucs2_t *strpbrk_wa(const smb_ucs2_t *s, const char *p)
 smb_ucs2_t *strstr_wa(const smb_ucs2_t *s, const char *ins)
 {
 	smb_ucs2_t *r;
-	size_t slen, inslen;
+	size_t inslen;
+
+	if (!s || !*s || !ins || !*ins) 
+		return NULL;
 
-	if (!s || !*s || !ins || !*ins) return NULL;
-	slen = strlen_w(s);
 	inslen = strlen(ins);
 	r = (smb_ucs2_t *)s;
+
 	while ((r = strchr_w(r, UCS2_CHAR(*ins)))) {
-		if (strncmp_wa(r, ins, inslen) == 0) return r;
+		if (strncmp_wa(r, ins, inslen) == 0) 
+			return r;
 		r++;
 	}
+
 	return NULL;
 }