[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-702-gb39c390

Matthias Dieter Wallnöfer mdw at samba.org
Thu Sep 24 15:59:35 MDT 2009


The branch, master has been updated
       via  b39c390280d1f268e2550c731057aec550a3f086 (commit)
       via  918b5a7e057bd91289ec06b3ef8d95da43a50ede (commit)
       via  506b0b6435ee86d58b4f92b91f1f2b0c498da3fd (commit)
      from  c789d041f0e7946a3c07a5ed8d70e5cb462d1773 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit b39c390280d1f268e2550c731057aec550a3f086
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Thu Sep 24 23:52:19 2009 +0200

    s3: Fix up various string "const" warnings
    
    My changed introduced some warnings. Fix them.

commit 918b5a7e057bd91289ec06b3ef8d95da43a50ede
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Thu Sep 24 23:50:05 2009 +0200

    s3:util_str "str_list_make_v3" - introduce also here the "const" result
    
    I did this to match with the default util strlist library.

commit 506b0b6435ee86d58b4f92b91f1f2b0c498da3fd
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Thu Sep 24 23:49:41 2009 +0200

    s3:vfs_default - correct function parameters

-----------------------------------------------------------------------

Summary of changes:
 source3/auth/auth.c           |   18 +++++++++---------
 source3/include/proto.h       |    2 +-
 source3/lib/util_str.c        |   18 +++++++++---------
 source3/modules/vfs_default.c |    3 ++-
 source3/param/loadparm.c      |    6 +++---
 source3/smbd/map_username.c   |    2 +-
 source3/smbd/password.c       |   24 ++++++++++++------------
 7 files changed, 37 insertions(+), 36 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/auth/auth.c b/source3/auth/auth.c
index ce8722a..b445987 100644
--- a/source3/auth/auth.c
+++ b/source3/auth/auth.c
@@ -455,7 +455,7 @@ NTSTATUS make_auth_context_subsystem(struct auth_context **auth_context)
 	NTSTATUS nt_status;
 
 	if (lp_auth_methods()
-	    && !(auth_method_list = str_list_copy(talloc_tos(), 
+	    && !(auth_method_list = (char **) str_list_copy(talloc_tos(), 
 			      lp_auth_methods()))) {
 		return NT_STATUS_NO_MEMORY;
 	}
@@ -465,13 +465,13 @@ NTSTATUS make_auth_context_subsystem(struct auth_context **auth_context)
 		{
 		case SEC_DOMAIN:
 			DEBUG(5,("Making default auth method list for security=domain\n"));
-			auth_method_list = str_list_make_v3(
+			auth_method_list = (char **) str_list_make_v3(
 				talloc_tos(), "guest sam winbind:ntdomain",
 				NULL);
 			break;
 		case SEC_SERVER:
 			DEBUG(5,("Making default auth method list for security=server\n"));
-			auth_method_list = str_list_make_v3(
+			auth_method_list = (char **) str_list_make_v3(
 				talloc_tos(), "guest sam smbserver",
 				NULL);
 			break;
@@ -479,36 +479,36 @@ NTSTATUS make_auth_context_subsystem(struct auth_context **auth_context)
 			if (lp_encrypted_passwords()) {	
 				if ((lp_server_role() == ROLE_DOMAIN_PDC) || (lp_server_role() == ROLE_DOMAIN_BDC)) {
 					DEBUG(5,("Making default auth method list for DC, security=user, encrypt passwords = yes\n"));
-					auth_method_list = str_list_make_v3(
+					auth_method_list = (char **) str_list_make_v3(
 						talloc_tos(),
 						"guest sam winbind:trustdomain",
 						NULL);
 				} else {
 					DEBUG(5,("Making default auth method list for standalone security=user, encrypt passwords = yes\n"));
-					auth_method_list = str_list_make_v3(
+					auth_method_list = (char **) str_list_make_v3(
 						talloc_tos(), "guest sam",
 						NULL);
 				}
 			} else {
 				DEBUG(5,("Making default auth method list for security=user, encrypt passwords = no\n"));
-				auth_method_list = str_list_make_v3(
+				auth_method_list = (char **) str_list_make_v3(
 					talloc_tos(), "guest unix", NULL);
 			}
 			break;
 		case SEC_SHARE:
 			if (lp_encrypted_passwords()) {
 				DEBUG(5,("Making default auth method list for security=share, encrypt passwords = yes\n"));
-				auth_method_list = str_list_make_v3(
+				auth_method_list = (char **) str_list_make_v3(
 					talloc_tos(), "guest sam", NULL);
 			} else {
 				DEBUG(5,("Making default auth method list for security=share, encrypt passwords = no\n"));
-				auth_method_list = str_list_make_v3(
+				auth_method_list = (char **) str_list_make_v3(
 					talloc_tos(), "guest unix", NULL);
 			}
 			break;
 		case SEC_ADS:
 			DEBUG(5,("Making default auth method list for security=ADS\n"));
-			auth_method_list = str_list_make_v3(
+			auth_method_list = (char **) str_list_make_v3(
 				talloc_tos(), "guest sam winbind:ntdomain",
 				NULL);
 			break;
diff --git a/source3/include/proto.h b/source3/include/proto.h
index d664a26..e17486b 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1563,7 +1563,7 @@ bool validate_net_name( const char *name,
 		const char *invalid_chars,
 		int max_len);
 char *escape_shell_string(const char *src);
-char **str_list_make_v3(TALLOC_CTX *mem_ctx, const char *string, const char *sep);
+const char **str_list_make_v3(TALLOC_CTX *mem_ctx, const char *string, const char *sep);
 
 /* The following definitions come from lib/util_unistr.c  */
 
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index c197fd7..2136388 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -1616,7 +1616,7 @@ bool str_list_sub_basic( char **list, const char *smb_name,
 }
 
 /******************************************************************************
- substritute a specific pattern in a string list
+ substitute a specific pattern in a string list
  *****************************************************************************/
 
 bool str_list_substitute(char **list, const char *pattern, const char *insert)
@@ -2430,18 +2430,18 @@ char *escape_shell_string(const char *src)
 
 #define S_LIST_ABS 16 /* List Allocation Block Size */
 
-char **str_list_make_v3(TALLOC_CTX *mem_ctx, const char *string, const char *sep)
+const char **str_list_make_v3(TALLOC_CTX *mem_ctx, const char *string,
+	const char *sep)
 {
-	char **list;
+	const char **list;
 	const char *str;
-	char *s;
+	char *s, *tok;
 	int num, lsize;
-	char *tok;
 
 	if (!string || !*string)
 		return NULL;
 
-	list = TALLOC_ARRAY(mem_ctx, char *, S_LIST_ABS+1);
+	list = TALLOC_ARRAY(mem_ctx, const char *, S_LIST_ABS+1);
 	if (list == NULL) {
 		return NULL;
 	}
@@ -2461,11 +2461,11 @@ char **str_list_make_v3(TALLOC_CTX *mem_ctx, const char *string, const char *sep
 	while (next_token_talloc(list, &str, &tok, sep)) {
 
 		if (num == lsize) {
-			char **tmp;
+			const char **tmp;
 
 			lsize += S_LIST_ABS;
 
-			tmp = TALLOC_REALLOC_ARRAY(mem_ctx, list, char *,
+			tmp = TALLOC_REALLOC_ARRAY(mem_ctx, list, const char *,
 						   lsize + 1);
 			if (tmp == NULL) {
 				DEBUG(0,("str_list_make: "
@@ -2477,7 +2477,7 @@ char **str_list_make_v3(TALLOC_CTX *mem_ctx, const char *string, const char *sep
 			list = tmp;
 
 			memset (&list[num], 0,
-				((sizeof(char**)) * (S_LIST_ABS +1)));
+				((sizeof(const char**)) * (S_LIST_ABS +1)));
 		}
 
 		list[num] = tok;
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 408721a..c92bc8e 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -652,7 +652,8 @@ static int vfswrap_lstat(vfs_handle_struct *handle,
 }
 
 static NTSTATUS vfswrap_translate_name(vfs_handle_struct *handle,
-				       char **mapped_name)
+				       char **mapped_name,
+				       enum vfs_translate_direction direction)
 {
 	/* Default behavior is a NOOP */
 
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index b278b96..c93787e 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -6745,7 +6745,7 @@ static void copy_service(struct service *pserviceDest, struct service *pserviceS
 					break;
 				case P_LIST:
 					TALLOC_FREE(*((char ***)dest_ptr));
-					*((char ***)dest_ptr) = str_list_copy(NULL, 
+					*((const char ***)dest_ptr) = str_list_copy(NULL, 
 						      *(const char ***)src_ptr);
 					break;
 				default:
@@ -8218,8 +8218,8 @@ static void lp_save_defaults(void)
 			continue;
 		switch (parm_table[i].type) {
 			case P_LIST:
-				parm_table[i].def.lvalue = str_list_copy(
-					NULL, *(const char ***)parm_table[i].ptr);
+				parm_table[i].def.lvalue = (char **)
+					str_list_copy(NULL, *(const char ***)parm_table[i].ptr);
 				break;
 			case P_STRING:
 			case P_USTRING:
diff --git a/source3/smbd/map_username.c b/source3/smbd/map_username.c
index 24b4ddd..e9ef74c 100644
--- a/source3/smbd/map_username.c
+++ b/source3/smbd/map_username.c
@@ -146,7 +146,7 @@ bool map_username(struct smbd_server_connection *sconn, fstring user)
 	while((s=fgets_slash(buf,sizeof(buf),f))!=NULL) {
 		char *unixname = s;
 		char *dosname = strchr_m(unixname,'=');
-		char **dosuserlist;
+		const char **dosuserlist;
 		bool return_if_mapped = False;
 
 		if (!dosname)
diff --git a/source3/smbd/password.c b/source3/smbd/password.c
index 4c1cef4..d6a8447 100644
--- a/source3/smbd/password.c
+++ b/source3/smbd/password.c
@@ -551,14 +551,13 @@ bool user_in_list(struct smbd_server_connection *sconn,
 static bool user_ok(struct smbd_server_connection *sconn,
 		    const char *user, int snum)
 {
-	char **valid, **invalid;
 	bool ret;
 
-	valid = invalid = NULL;
 	ret = True;
 
 	if (lp_invalid_users(snum)) {
-		invalid = str_list_copy(talloc_tos(), lp_invalid_users(snum));
+		char **invalid = (char **) str_list_copy(talloc_tos(),
+			lp_invalid_users(snum));
 		if (invalid &&
 		    str_list_substitute(invalid, "%S", lp_servicename(snum))) {
 
@@ -567,36 +566,37 @@ static bool user_ok(struct smbd_server_connection *sconn,
 
 			if ( invalid && str_list_sub_basic(invalid, "", "") ) {
 				ret = !user_in_list(sconn, user,
-						    (const char **)invalid);
+						(const char **)invalid);
 			}
 		}
+		TALLOC_FREE(invalid);
 	}
-	TALLOC_FREE(invalid);
 
 	if (ret && lp_valid_users(snum)) {
-		valid = str_list_copy(talloc_tos(), lp_valid_users(snum));
-		if ( valid &&
-		     str_list_substitute(valid, "%S", lp_servicename(snum)) ) {
+		char **valid = (char **) str_list_copy(talloc_tos(),
+			lp_valid_users(snum));
+		if (valid &&
+		     str_list_substitute(valid, "%S", lp_servicename(snum))) {
 
 			/* This is used in sec=share only, so no current user
 			 * around to pass to str_list_sub_basic() */
 
 			if ( valid && str_list_sub_basic(valid, "", "") ) {
 				ret = user_in_list(sconn, user,
-						   (const char **)valid);
+						(const char **)valid);
 			}
 		}
+		TALLOC_FREE(valid);
 	}
-	TALLOC_FREE(valid);
 
 	if (ret && lp_onlyuser(snum)) {
-		char **user_list = str_list_make_v3(
+		char **user_list = (char **) str_list_make_v3(
 			talloc_tos(), lp_username(snum), NULL);
 		if (user_list &&
 		    str_list_substitute(user_list, "%S",
 					lp_servicename(snum))) {
 			ret = user_in_list(sconn, user,
-					   (const char **)user_list);
+						(const char **)user_list);
 		}
 		TALLOC_FREE(user_list);
 	}


-- 
Samba Shared Repository


More information about the samba-cvs mailing list