svn commit: samba r12305 - branches/SAMBA_3_0/source/smbd trunk/source/smbd

[vlendec at samba.org]

Author: vlendec
Date: 2005-12-17 16:31:04 +0000 (Sat, 17 Dec 2005)
New Revision: 12305

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12305

Log:
Reformatting
Modified:
   branches/SAMBA_3_0/source/smbd/password.c
   trunk/source/smbd/password.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/password.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/password.c	2005-12-17 15:45:38 UTC (rev 12304)
+++ branches/SAMBA_3_0/source/smbd/password.c	2005-12-17 16:31:04 UTC (rev 12305)
@@ -381,9 +381,14 @@
 
 	if (lp_invalid_users(snum)) {
 		str_list_copy(&invalid, lp_invalid_users(snum));
-		if (invalid && str_list_substitute(invalid, "%S", lp_servicename(snum))) {
-			if ( invalid && str_list_sub_basic(invalid, current_user_info.smb_name) ) {
-				ret = !user_in_list(user, (const char **)invalid, groups, n_groups);
+		if (invalid &&
+		    str_list_substitute(invalid, "%S", lp_servicename(snum))) {
+			if ( invalid &&
+			     str_list_sub_basic(invalid,
+						current_user_info.smb_name) ) {
+				ret = !user_in_list(user,
+						    (const char **)invalid,
+						    groups, n_groups);
 			}
 		}
 	}
@@ -392,9 +397,13 @@
 
 	if (ret && lp_valid_users(snum)) {
 		str_list_copy(&valid, lp_valid_users(snum));
-		if ( valid && str_list_substitute(valid, "%S", lp_servicename(snum)) ) {
-			if ( valid && str_list_sub_basic(valid, current_user_info.smb_name) ) {
-				ret = user_in_list(user, (const char **)valid, groups, n_groups);
+		if ( valid &&
+		     str_list_substitute(valid, "%S", lp_servicename(snum)) ) {
+			if ( valid &&
+			     str_list_sub_basic(valid,
+						current_user_info.smb_name) ) {
+				ret = user_in_list(user, (const char **)valid,
+						   groups, n_groups);
 			}
 		}
 	}
@@ -403,8 +412,11 @@
 
 	if (ret && lp_onlyuser(snum)) {
 		char **user_list = str_list_make (lp_username(snum), NULL);
-		if (user_list && str_list_substitute(user_list, "%S", lp_servicename(snum))) {
-			ret = user_in_list(user, (const char **)user_list, groups, n_groups);
+		if (user_list &&
+		    str_list_substitute(user_list, "%S",
+					lp_servicename(snum))) {
+			ret = user_in_list(user, (const char **)user_list,
+					   groups, n_groups);
 		}
 		if (user_list) str_list_free (&user_list);
 	}

Modified: trunk/source/smbd/password.c
===================================================================
--- trunk/source/smbd/password.c	2005-12-17 15:45:38 UTC (rev 12304)
+++ trunk/source/smbd/password.c	2005-12-17 16:31:04 UTC (rev 12305)
@@ -381,9 +381,14 @@
 
 	if (lp_invalid_users(snum)) {
 		str_list_copy(&invalid, lp_invalid_users(snum));
-		if (invalid && str_list_substitute(invalid, "%S", lp_servicename(snum))) {
-			if ( invalid && str_list_sub_basic(invalid, current_user_info.smb_name) ) {
-				ret = !user_in_list(user, (const char **)invalid, groups, n_groups);
+		if (invalid &&
+		    str_list_substitute(invalid, "%S", lp_servicename(snum))) {
+			if ( invalid &&
+			     str_list_sub_basic(invalid,
+						current_user_info.smb_name) ) {
+				ret = !user_in_list(user,
+						    (const char **)invalid,
+						    groups, n_groups);
 			}
 		}
 	}
@@ -392,9 +397,13 @@
 
 	if (ret && lp_valid_users(snum)) {
 		str_list_copy(&valid, lp_valid_users(snum));
-		if ( valid && str_list_substitute(valid, "%S", lp_servicename(snum)) ) {
-			if ( valid && str_list_sub_basic(valid, current_user_info.smb_name) ) {
-				ret = user_in_list(user, (const char **)valid, groups, n_groups);
+		if ( valid &&
+		     str_list_substitute(valid, "%S", lp_servicename(snum)) ) {
+			if ( valid &&
+			     str_list_sub_basic(valid,
+						current_user_info.smb_name) ) {
+				ret = user_in_list(user, (const char **)valid,
+						   groups, n_groups);
 			}
 		}
 	}
@@ -403,8 +412,11 @@
 
 	if (ret && lp_onlyuser(snum)) {
 		char **user_list = str_list_make (lp_username(snum), NULL);
-		if (user_list && str_list_substitute(user_list, "%S", lp_servicename(snum))) {
-			ret = user_in_list(user, (const char **)user_list, groups, n_groups);
+		if (user_list &&
+		    str_list_substitute(user_list, "%S",
+					lp_servicename(snum))) {
+			ret = user_in_list(user, (const char **)user_list,
+					   groups, n_groups);
 		}
 		if (user_list) str_list_free (&user_list);
 	}