Fix nonempty blank lines

2 files changed, 117 insertions, 119 deletions

diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index e677d429af..d26a667f44 100644
--- a/source3/passdb/passdb.c
+++ b/source3/passdb/passdb.c
@@ -7,17 +7,17 @@
    Copyright (C) Andrew Bartlett		2001-2002
    Copyright (C) Simo Sorce			2003
    Copyright (C) Volker Lendecke 		2006
-      
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -67,16 +67,16 @@ static int samu_destroy(struct samu *user)
 struct samu *samu_new( TALLOC_CTX *ctx )
 {
 	struct samu *user;
-	
+
 	if ( !(user = TALLOC_ZERO_P( ctx, struct samu )) ) {
 		DEBUG(0,("samuser_new: Talloc failed!\n"));
 		return NULL;
 	}
-	
+
 	talloc_set_destructor( user, samu_destroy );
-	
+
 	/* no initial methods */
-	
+
 	user->methods = NULL;
 
         /* Don't change these timestamp settings without a good reason.
@@ -98,7 +98,7 @@ struct samu *samu_new( TALLOC_CTX *ctx )
 
 	/* Some parts of samba strlen their pdb_get...() returns, 
 	   so this keeps the interface unchanged for now. */
-	   
+
 	user->username = "";
 	user->domain = "";
 	user->nt_username = "";
@@ -118,8 +118,7 @@ struct samu *samu_new( TALLOC_CTX *ctx )
 	   asks for a filtered list of users. */
 
 	user->acct_ctrl = ACB_NORMAL;
-	
-	
+
 	return user;
 }
 
@@ -140,7 +139,7 @@ static NTSTATUS samu_set_unix_internal(struct samu *user, const struct passwd *p
 	}
 
 	/* Basic properties based upon the Unix account information */
-	
+
 	pdb_set_username(user, pwd->pw_name, PDB_SET);
 	pdb_set_fullname(user, pwd->pw_gecos, PDB_SET);
 	pdb_set_domain (user, get_global_sam_name(), PDB_DEFAULT);
@@ -149,29 +148,29 @@ static NTSTATUS samu_set_unix_internal(struct samu *user, const struct passwd *p
 	   will be rejected by other parts of the Samba code. 
 	   Rely on pdb_get_group_sid() to "Do The Right Thing" (TM)  
 	   --jerry */
-	   
+
 	gid_to_sid(&group_sid, pwd->pw_gid);
 	pdb_set_group_sid(user, &group_sid, PDB_SET);
 #endif
-	
+
 	/* save the password structure for later use */
-	
+
 	user->unix_pw = tcopy_passwd( user, pwd );
 
 	/* Special case for the guest account which must have a RID of 501 */
-	
+
 	if ( strequal( pwd->pw_name, guest_account ) ) {
 		if ( !pdb_set_user_sid_from_rid(user, DOMAIN_USER_RID_GUEST, PDB_DEFAULT)) {
 			return NT_STATUS_NO_SUCH_USER;
 		}
 		return NT_STATUS_OK;
 	}
-	
+
 	/* Non-guest accounts...Check for a workstation or user account */
 
 	if (pwd->pw_name[strlen(pwd->pw_name)-1] == '$') {
 		/* workstation */
-		
+
 		if (!pdb_set_acct_ctrl(user, ACB_WSTRUST, PDB_DEFAULT)) {
 			DEBUG(1, ("Failed to set 'workstation account' flags for user %s.\n", 
 				pwd->pw_name));
@@ -180,15 +179,15 @@ static NTSTATUS samu_set_unix_internal(struct samu *user, const struct passwd *p
 	} 
 	else {
 		/* user */
-		
+
 		if (!pdb_set_acct_ctrl(user, ACB_NORMAL, PDB_DEFAULT)) {
 			DEBUG(1, ("Failed to set 'normal account' flags for user %s.\n", 
 				pwd->pw_name));
 			return NT_STATUS_INVALID_ACCOUNT_NAME;
 		}
-		
+
 		/* set some basic attributes */
-	
+
 		pdb_set_profile_path(user, talloc_sub_specified(user, 
 			lp_logon_path(), pwd->pw_name, domain, pwd->pw_uid, pwd->pw_gid), 
 			PDB_DEFAULT);		
@@ -202,7 +201,7 @@ static NTSTATUS samu_set_unix_internal(struct samu *user, const struct passwd *p
 			lp_logon_script(), pwd->pw_name, domain, pwd->pw_uid, pwd->pw_gid), 
 			PDB_DEFAULT);
 	}
-	
+
 	/* Now deal with the user SID.  If we have a backend that can generate 
 	   RIDs, then do so.  But sometimes the caller just wanted a structure 
 	   initialized and will fill in these fields later (such as from a 
@@ -211,7 +210,7 @@ static NTSTATUS samu_set_unix_internal(struct samu *user, const struct passwd *p
 	if ( create && !pdb_rid_algorithm() ) {
 		uint32 user_rid;
 		DOM_SID user_sid;
-		
+
 		if ( !pdb_new_rid( &user_rid ) ) {
 			DEBUG(3, ("Could not allocate a new RID\n"));
 			return NT_STATUS_ACCESS_DENIED;
@@ -224,18 +223,18 @@ static NTSTATUS samu_set_unix_internal(struct samu *user, const struct passwd *p
 			DEBUG(3, ("pdb_set_user_sid failed\n"));
 			return NT_STATUS_INTERNAL_ERROR;
 		}
-		
+
 		return NT_STATUS_OK;
 	}
 
 	/* generate a SID for the user with the RID algorithm */
-	
+
 	urid = algorithmic_pdb_uid_to_user_rid( user->unix_pw->pw_uid );
-		
+
 	if ( !pdb_set_user_sid_from_rid( user, urid, PDB_SET) ) {
 		return NT_STATUS_INTERNAL_ERROR;
 	}
-	
+
 	return NT_STATUS_OK;
 }
 
@@ -365,10 +364,10 @@ bool pdb_gethexpwd(const char *p, unsigned char *pwd)
 	unsigned char   lonybble, hinybble;
 	const char      *hexchars = "0123456789ABCDEF";
 	char           *p1, *p2;
-	
+
 	if (!p)
 		return false;
-	
+
 	for (i = 0; i < 32; i += 2) {
 		hinybble = toupper_ascii(p[i]);
 		lonybble = toupper_ascii(p[i + 1]);
@@ -554,16 +553,16 @@ bool lookup_global_sam_name(const char *name, int flags, uint32_t *rid,
 {
 	GROUP_MAP map;
 	bool ret;
-	
+
 	/* Windows treats "MACHINE\None" as a special name for 
 	   rid 513 on non-DCs.  You cannot create a user or group
 	   name "None" on Windows.  You will get an error that 
 	   the group already exists. */
-	   
+
 	if ( strequal( name, "None" ) ) {
 		*rid = DOMAIN_GROUP_RID_USERS;
 		*type = SID_NAME_DOM_GRP;
-		
+
 		return True;
 	}
 
@@ -578,7 +577,7 @@ bool lookup_global_sam_name(const char *name, int flags, uint32_t *rid,
 		if ( !(sam_account = samu_new( NULL )) ) {
 			return False;
 		}
-	
+
 		become_root();
 		ret =  pdb_getsampwnam(sam_account, name);
 		unbecome_root();
@@ -586,7 +585,7 @@ bool lookup_global_sam_name(const char *name, int flags, uint32_t *rid,
 		if (ret) {
 			sid_copy(&user_sid, pdb_get_user_sid(sam_account));
 		}
-		
+
 		TALLOC_FREE(sam_account);
 
 		if (ret) {
@@ -654,7 +653,7 @@ NTSTATUS local_password_change(const char *user_name,
 	if(!pdb_getsampwnam(sam_pass, user_name)) {
 		unbecome_root();
 		TALLOC_FREE(sam_pass);
-		
+
 		if ((local_flags & LOCAL_ADD_USER) || (local_flags & LOCAL_DELETE_USER)) {
 			int tmp_debug = DEBUGLEVEL;
 			struct passwd *pwd;
@@ -754,7 +753,7 @@ NTSTATUS local_password_change(const char *user_name,
 			return NT_STATUS_UNSUCCESSFUL;
 		}
 	}
-	
+
 	if (local_flags & LOCAL_SET_NO_PASSWORD) {
 		if (!pdb_set_acct_ctrl (sam_pass, pdb_get_acct_ctrl(sam_pass)|ACB_PWNOTREQ, PDB_CHANGED)) {
 			if (asprintf(pp_err_str, "Failed to set 'no password required' flag for user %s.\n", user_name) < 0) {
@@ -789,7 +788,7 @@ NTSTATUS local_password_change(const char *user_name,
 			TALLOC_FREE(sam_pass);
 			return NT_STATUS_UNSUCCESSFUL;
 		}
-		
+
 		if (!pdb_set_plaintext_passwd (sam_pass, new_passwd)) {
 			if (asprintf(pp_err_str, "Failed to set password for user %s.\n", user_name) < 0) {
 				*pp_err_str = NULL;
@@ -893,7 +892,7 @@ static bool init_samu_from_buffer_v0(struct samu *sampass, uint8 *buf, uint32 bu
 		dir_drive_len, unknown_str_len, munged_dial_len,
 		fullname_len, homedir_len, logon_script_len,
 		profile_path_len, acct_desc_len, workstations_len;
-		
+
 	uint32	user_rid, group_rid, remove_me, hours_len, unknown_6;
 	uint16	acct_ctrl, logon_divs;
 	uint16	bad_password_count, logon_count;
@@ -902,7 +901,7 @@ static bool init_samu_from_buffer_v0(struct samu *sampass, uint8 *buf, uint32 bu
 	uint32		len = 0;
 	uint32		lm_pw_len, nt_pw_len, hourslen;
 	bool ret = True;
-	
+
 	if(sampass == NULL || buf == NULL) {
 		DEBUG(0, ("init_samu_from_buffer_v0: NULL parameters found!\n"));
 		return False;
@@ -942,7 +941,7 @@ static bool init_samu_from_buffer_v0(struct samu *sampass, uint8 *buf, uint32 bu
 		&bad_password_count,					/* w */
 		&logon_count,						/* w */
 		&unknown_6);						/* d */
-		
+
 	if (len == (uint32) -1)  {
 		ret = False;
 		goto done;
@@ -987,7 +986,7 @@ static bool init_samu_from_buffer_v0(struct samu *sampass, uint8 *buf, uint32 bu
 					 lp_logon_script()),
 			PDB_DEFAULT);
 	}
-	
+
 	if (profile_path) {	
 		pdb_set_profile_path(sampass, profile_path, PDB_SET);
 	} else {
@@ -1079,7 +1078,7 @@ static bool init_samu_from_buffer_v1(struct samu *sampass, uint8 *buf, uint32 bu
 		dir_drive_len, unknown_str_len, munged_dial_len,
 		fullname_len, homedir_len, logon_script_len,
 		profile_path_len, acct_desc_len, workstations_len;
-		
+
 	uint32	user_rid, group_rid, remove_me, hours_len, unknown_6;
 	uint16	acct_ctrl, logon_divs;
 	uint16	bad_password_count, logon_count;
@@ -1088,7 +1087,7 @@ static bool init_samu_from_buffer_v1(struct samu *sampass, uint8 *buf, uint32 bu
 	uint32		len = 0;
 	uint32		lm_pw_len, nt_pw_len, hourslen;
 	bool ret = True;
-	
+
 	if(sampass == NULL || buf == NULL) {
 		DEBUG(0, ("init_samu_from_buffer_v1: NULL parameters found!\n"));
 		return False;
@@ -1130,7 +1129,7 @@ static bool init_samu_from_buffer_v1(struct samu *sampass, uint8 *buf, uint32 bu
 		&bad_password_count,					/* w */
 		&logon_count,						/* w */
 		&unknown_6);						/* d */
-		
+
 	if (len == (uint32) -1)  {
 		ret = False;
 		goto done;
@@ -1178,7 +1177,7 @@ static bool init_samu_from_buffer_v1(struct samu *sampass, uint8 *buf, uint32 bu
 					 lp_logon_script()),
 			PDB_DEFAULT);
 	}
-	
+
 	if (profile_path) {	
 		pdb_set_profile_path(sampass, profile_path, PDB_SET);
 	} else {
@@ -1268,7 +1267,7 @@ static bool init_samu_from_buffer_v2(struct samu *sampass, uint8 *buf, uint32 bu
 		dir_drive_len, unknown_str_len, munged_dial_len,
 		fullname_len, homedir_len, logon_script_len,
 		profile_path_len, acct_desc_len, workstations_len;
-		
+
 	uint32	user_rid, group_rid, hours_len, unknown_6;
 	uint16	acct_ctrl, logon_divs;
 	uint16	bad_password_count, logon_count;
@@ -1280,12 +1279,12 @@ static bool init_samu_from_buffer_v2(struct samu *sampass, uint8 *buf, uint32 bu
 	bool ret = True;
 	fstring tmp_string;
 	bool expand_explicit = lp_passdb_expand_explicit();
-	
+
 	if(sampass == NULL || buf == NULL) {
 		DEBUG(0, ("init_samu_from_buffer_v2: NULL parameters found!\n"));
 		return False;
 	}
-									
+
 /* SAMU_BUFFER_FORMAT_V2       "dddddddBBBBBBBBBBBBddBBBwwdBwwd" */
 
 	/* unpack the buffer into variables */
@@ -1323,7 +1322,7 @@ static bool init_samu_from_buffer_v2(struct samu *sampass, uint8 *buf, uint32 bu
 		&bad_password_count,					/* w */
 		&logon_count,						/* w */
 		&unknown_6);						/* d */
-		
+
 	if (len == (uint32) -1)  {
 		ret = False;
 		goto done;
@@ -1376,7 +1375,7 @@ static bool init_samu_from_buffer_v2(struct samu *sampass, uint8 *buf, uint32 bu
 					 lp_logon_script()),
 			PDB_DEFAULT);
 	}
-	
+
 	if (profile_path) {	
 		fstrcpy( tmp_string, profile_path );
 		if (expand_explicit) {
@@ -1503,7 +1502,7 @@ static bool init_samu_from_buffer_v3(struct samu *sampass, uint8 *buf, uint32 bu
 		dir_drive_len, unknown_str_len, munged_dial_len,
 		fullname_len, homedir_len, logon_script_len,
 		profile_path_len, acct_desc_len, workstations_len;
-		
+
 	uint32	user_rid, group_rid, hours_len, unknown_6, acct_ctrl;
 	uint16  logon_divs;
 	uint16	bad_password_count, logon_count;
@@ -1515,12 +1514,12 @@ static bool init_samu_from_buffer_v3(struct samu *sampass, uint8 *buf, uint32 bu
 	bool ret = True;
 	fstring tmp_string;
 	bool expand_explicit = lp_passdb_expand_explicit();
-	
+
 	if(sampass == NULL || buf == NULL) {
 		DEBUG(0, ("init_samu_from_buffer_v3: NULL parameters found!\n"));
 		return False;
 	}
-									
+
 /* SAMU_BUFFER_FORMAT_V3       "dddddddBBBBBBBBBBBBddBBBdwdBwwd" */
 
 	/* unpack the buffer into variables */
@@ -1559,7 +1558,7 @@ static bool init_samu_from_buffer_v3(struct samu *sampass, uint8 *buf, uint32 bu
 		&bad_password_count,					/* w */
 		&logon_count,						/* w */
 		&unknown_6);						/* d */
-		
+
 	if (len == (uint32) -1)  {
 		ret = False;
 		goto done;
@@ -1612,7 +1611,7 @@ static bool init_samu_from_buffer_v3(struct samu *sampass, uint8 *buf, uint32 bu
 					 lp_logon_script()),
 			PDB_DEFAULT);
 	}
-	
+
 	if (profile_path) {	
 		fstrcpy( tmp_string, profile_path );
 		if (expand_explicit) {
@@ -1839,12 +1838,12 @@ static uint32 init_buffer_from_samu_v3 (uint8 **buf, struct samu *sampass, bool
 	} else {
 		profile_path_len = 0;
 	}
-	
+
 	lm_pw = pdb_get_lanman_passwd(sampass);
 	if (!lm_pw) {
 		lm_pw_len = 0;
 	}
-	
+
 	nt_pw = pdb_get_nt_passwd(sampass);
 	if (!nt_pw) {
 		nt_pw_len = 0;
@@ -1927,7 +1926,7 @@ static uint32 init_buffer_from_samu_v3 (uint8 **buf, struct samu *sampass, bool
 		DEBUG(0,("init_buffer_from_samu_v3: Unable to malloc() memory for buffer!\n"));
 		return (-1);
 	}
-	
+
 	/* now for the real call to tdb_pack() */
 	buflen = tdb_pack(*buf, len,  SAMU_BUFFER_FORMAT_V3,
 		logon_time,				/* d */
@@ -1961,7 +1960,7 @@ static uint32 init_buffer_from_samu_v3 (uint8 **buf, struct samu *sampass, bool
 		pdb_get_bad_password_count(sampass),	/* w */
 		pdb_get_logon_count(sampass),		/* w */
 		pdb_get_unknown_6(sampass));		/* d */
-	
+
 	/* check to make sure we got it correct */
 	if (buflen != len) {
 		DEBUG(0, ("init_buffer_from_samu_v3: somthing odd is going on here: bufflen (%lu) != len (%lu) in tdb_pack operations!\n", 
@@ -2038,7 +2037,7 @@ bool pdb_copy_sam_account(struct samu *dst, struct samu *src )
 	}
 
 	dst->methods = src->methods;
-	
+
 	if ( src->unix_pw ) {
 		dst->unix_pw = tcopy_passwd( dst, src->unix_pw );
 		if (!dst->unix_pw) {
@@ -2127,7 +2126,7 @@ bool pdb_update_autolock_flag(struct samu *sampass, bool *updated)
 		DEBUG(9, ("pdb_update_autolock_flag: No reset duration, can't reset autolock\n"));
 		return True;
 	}
-		      
+
 	LastBadPassword = pdb_get_bad_password_time(sampass);
 	DEBUG(7, ("pdb_update_autolock_flag: Account %s, LastBadPassword=%d, duration=%d, current time =%d.\n",
 		  pdb_get_username(sampass), (uint32)LastBadPassword, duration*60, (uint32)time(NULL)));
@@ -2150,7 +2149,7 @@ bool pdb_update_autolock_flag(struct samu *sampass, bool *updated)
 			*updated = True;
 		}
 	}
-	
+
 	return True;
 }
 
diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c
index c8e35783c0..3ae4b1d61a 100644
--- a/source3/smbd/lanman.c
+++ b/source3/smbd/lanman.c
@@ -6,17 +6,17 @@
 
    SMB Version handling
    Copyright (C) John H Terpstra 1995-1998
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
    */
@@ -876,9 +876,9 @@ static bool api_DosPrintQGetInfo(connection_struct *conn, uint16 vuid,
 	/* remove any trailing username */
 	if ((p = strchr_m(QueueName,'%')))
 		*p = 0;
- 
+
 	DEBUG(3,("api_DosPrintQGetInfo uLevel=%d name=%s\n",uLevel,QueueName));
- 
+
 	/* check it's a supported varient */
 	if (!prefix_ok(str1,"zWrLh"))
 		return False;
@@ -899,11 +899,11 @@ static bool api_DosPrintQGetInfo(connection_struct *conn, uint16 vuid,
 		SSVAL(*rparam,4,0);
 		return(True);
 	}
- 
+
 	snum = find_service(QueueName);
 	if ( !(lp_snum_ok(snum) && lp_print_ok(snum)) )
 		return False;
-		
+
 	if (uLevel==52) {
 		count = get_printerdrivernumber(snum);
 		DEBUG(3,("api_DosPrintQGetInfo: Driver files count: %d\n",count));
@@ -934,7 +934,7 @@ static bool api_DosPrintQGetInfo(connection_struct *conn, uint16 vuid,
 	}
 
 	*rdata_len = desc.usedlen;
-  
+
 	/*
 	 * We must set the return code to ERRbuftoosmall
 	 * in order to support lanman style printing with Win NT/2k
@@ -942,7 +942,7 @@ static bool api_DosPrintQGetInfo(connection_struct *conn, uint16 vuid,
 	 */
 	if (!mdrcnt && lp_disable_spoolss())
 		desc.errcode = ERRbuftoosmall;
- 
+
 	*rdata_len = desc.usedlen;
 	*rparam_len = 6;
 	*rparam = smb_realloc_limit(*rparam,*rparam_len);
@@ -954,7 +954,7 @@ static bool api_DosPrintQGetInfo(connection_struct *conn, uint16 vuid,
 	SSVALS(*rparam,0,desc.errcode);
 	SSVAL(*rparam,2,0);
 	SSVAL(*rparam,4,desc.neededlen);
-  
+
 	DEBUG(4,("printqgetinfo: errorcode %d\n",desc.errcode));
 
 	SAFE_FREE(queue);
@@ -986,7 +986,7 @@ static bool api_DosPrintQEnum(connection_struct *conn, uint16 vuid,
 	print_status_struct *status = NULL;
 	int *subcntarr = NULL;
 	int queuecnt = 0, subcnt = 0, succnt = 0;
- 
+
 	if (!param_format || !output_format1 || !p) {
 		return False;
 	}
@@ -994,7 +994,7 @@ static bool api_DosPrintQEnum(connection_struct *conn, uint16 vuid,
 	memset((char *)&desc,'\0',sizeof(desc));
 
 	DEBUG(3,("DosPrintQEnum uLevel=%d\n",uLevel));
- 
+
 	if (!prefix_ok(param_format,"WrLeh")) {
 		return False;
 	}
@@ -1071,7 +1071,7 @@ static bool api_DosPrintQEnum(connection_struct *conn, uint16 vuid,
 	}
 
 	SAFE_FREE(subcntarr);
- 
+
 	*rdata_len = desc.usedlen;
 	*rparam_len = 8;
 	*rparam = smb_realloc_limit(*rparam,*rparam_len);
@@ -1082,7 +1082,7 @@ static bool api_DosPrintQEnum(connection_struct *conn, uint16 vuid,
 	SSVAL(*rparam,2,0);
 	SSVAL(*rparam,4,succnt);
 	SSVAL(*rparam,6,queuecnt);
-  
+
 	for (i = 0; i < queuecnt; i++) {
 		if (queue) {
 			SAFE_FREE(queue[i]);
@@ -1091,7 +1091,7 @@ static bool api_DosPrintQEnum(connection_struct *conn, uint16 vuid,
 
 	SAFE_FREE(queue);
 	SAFE_FREE(status);
-  
+
 	return True;
 
   err:
@@ -1248,11 +1248,11 @@ static int get_server_info(uint32 servertype,
 			DEBUG(4,("s: dom mismatch "));
 			ok = False;
 		}
-    
+
 		if (!strequal(domain, s->domain) && !(servertype & SV_TYPE_DOMAIN_ENUM)) {
 			ok = False;
 		}
-    
+
 		/* We should never return a server type with a SV_TYPE_LOCAL_LIST_ONLY set. */
 		s->type &= ~SV_TYPE_LOCAL_LIST_ONLY;
 
@@ -1266,7 +1266,7 @@ static int get_server_info(uint32 servertype,
 				s->name, s->type, s->comment, s->domain));
 		}
 	}
-  
+
 	TALLOC_FREE(lines);
 	return count;
 }
@@ -1284,7 +1284,7 @@ static int fill_srv_info(struct srv_info_struct *service,
 	char* p2;
 	int l2;
 	int len;
- 
+
 	switch (uLevel) {
 		case 0:
 			struct_len = 16;
@@ -1295,7 +1295,7 @@ static int fill_srv_info(struct srv_info_struct *service,
 		default:
 			return -1;
 	}
- 
+
 	if (!buf) {
 		len = 0;
 		switch (uLevel) {
@@ -1308,7 +1308,7 @@ static int fill_srv_info(struct srv_info_struct *service,
 		*stringspace = len;
 		return struct_len + len;
 	}
-  
+
 	len = struct_len;
 	p = *buf;
 	if (*buflen < struct_len) {
@@ -1324,7 +1324,7 @@ static int fill_srv_info(struct srv_info_struct *service,
 	if (!baseaddr) {
 		baseaddr = p;
 	}
-  
+
 	switch (uLevel) {
 		case 0:
 			push_ascii(p,service->name, MAX_NETBIOSNAME_LEN, STR_TERMINATE);
@@ -1416,7 +1416,7 @@ static bool api_RNetServerEnum(connection_struct *conn, uint16 vuid,
 	if (!check_server_info(uLevel,str2)) {
 		return False;
 	}
-  
+
 	DEBUG(4, ("server request level: %s %8x ", str2, servertype));
 	DEBUG(4, ("domains_req:%s ", BOOLSTR(domain_request)));
 	DEBUG(4, ("local_only:%s\n", BOOLSTR(local_request)));
@@ -1454,7 +1454,7 @@ static bool api_RNetServerEnum(connection_struct *conn, uint16 vuid,
 			data_len += fill_srv_info(s,uLevel,0,&f_len,0,&s_len,0);
 			DEBUG(4,("fill_srv_info %20s %8x %25s %15s\n",
 				s->name, s->type, s->comment, s->domain));
-      
+
 			if (data_len <= buf_len) {
 				counted++;
 				fixed_len += f_len;
@@ -1470,7 +1470,7 @@ static bool api_RNetServerEnum(connection_struct *conn, uint16 vuid,
 	if (!*rdata) {
 		return False;
 	}
-  
+
 	p2 = (*rdata) + fixed_len;	/* auxilliary data (strings) will go here */
 	p = *rdata;
 	f_len = fixed_len;
@@ -1493,7 +1493,7 @@ static bool api_RNetServerEnum(connection_struct *conn, uint16 vuid,
 			count2--;
 		}
 	}
-  
+
 	*rparam_len = 8;
 	*rparam = smb_realloc_limit(*rparam,*rparam_len);
 	if (!*rparam) {
@@ -1540,9 +1540,9 @@ static bool api_RNetGroupGetUsers(connection_struct *conn, uint16 vuid,
 	if (!prefix_ok(str1,"zWrLeh")) {
 		return False;
 	}
-  
+
 	*rdata_len = 0;
-  
+
 	*rparam_len = 8;
 	*rparam = smb_realloc_limit(*rparam,*rparam_len);
 	if (!*rparam) {
@@ -1599,7 +1599,7 @@ static int fill_share_info(connection_struct *conn, int snum, int uLevel,
 	char* p2;
 	int l2;
 	int len;
- 
+
 	switch( uLevel ) {
 		case 0:
 			struct_len = 13;
@@ -1616,8 +1616,7 @@ static int fill_share_info(connection_struct *conn, int snum, int uLevel,
 		default:
 			return -1;
 	}
-  
- 
+
 	if (!buf) {
 		len = 0;
 
@@ -1635,7 +1634,7 @@ static int fill_share_info(connection_struct *conn, int snum, int uLevel,
 		}
 		return struct_len + len;
 	}
-  
+
 	len = struct_len;
 	p = *buf;
 	if ((*buflen) < struct_len) {
@@ -1653,9 +1652,9 @@ static int fill_share_info(connection_struct *conn, int snum, int uLevel,
 	if (!baseaddr) {
 		baseaddr = p;
 	}
-  
+
 	push_ascii(p,lp_servicename(snum),13, STR_TERMINATE);
-  
+
 	if (uLevel > 0) {
 		int type;
 
@@ -1671,7 +1670,7 @@ static int fill_share_info(connection_struct *conn, int snum, int uLevel,
 		SIVAL(p,16,PTR_DIFF(p2,baseaddr));
 		len += CopyExpanded(conn,snum,&p2,lp_comment(snum),&l2);
 	}
-  
+
 	if (uLevel > 1) {
 		SSVAL(p,20,ACCESS_READ|ACCESS_WRITE|ACCESS_CREATE); /* permissions */
 		SSVALS(p,22,-1);		/* max uses */
@@ -1680,7 +1679,7 @@ static int fill_share_info(connection_struct *conn, int snum, int uLevel,
 		len += CopyAndAdvance(&p2,lp_pathname(snum),&l2);
 		memset(p+30,0,SHPWLEN+2); /* passwd (reserved), pad field */
 	}
-  
+
 	if (uLevel > 2) {
 		memset(p+40,0,SHPWLEN+2);
 		SSVAL(p,50,0);
@@ -1691,7 +1690,7 @@ static int fill_share_info(connection_struct *conn, int snum, int uLevel,
 		SSVAL(p,64,0);
 		SSVAL(p,66,0);
 	}
-       
+
 	if (stringbuf) {
 		(*buf) = p + struct_len;
 		(*buflen) -= struct_len;
@@ -1718,7 +1717,7 @@ static bool api_RNetShareGetInfo(connection_struct *conn,uint16 vuid,
 	char *p = skip_string(param,tpscnt,netname);
 	int uLevel = get_safe_SVAL(param,tpscnt,p,0,-1);
 	int snum;
-  
+
 	if (!str1 || !str2 || !netname || !p) {
 		return False;
 	}
@@ -1727,7 +1726,7 @@ static bool api_RNetShareGetInfo(connection_struct *conn,uint16 vuid,
 	if (snum < 0) {
 		return False;
 	}
-  
+
 	/* check it's a supported varient */
 	if (!prefix_ok(str1,"zWrLh")) {
 		return False;
@@ -1735,7 +1734,7 @@ static bool api_RNetShareGetInfo(connection_struct *conn,uint16 vuid,
 	if (!check_share_info(uLevel,str2)) {
 		return False;
 	}
- 
+
 	*rdata = smb_realloc_limit(*rdata,mdrcnt);
 	if (!*rdata) {
 		return False;
@@ -1745,7 +1744,7 @@ static bool api_RNetShareGetInfo(connection_struct *conn,uint16 vuid,
 	if (*rdata_len < 0) {
 		return False;
 	}
- 
+
 	*rparam_len = 6;
 	*rparam = smb_realloc_limit(*rparam,*rparam_len);
 	if (!*rparam) {
@@ -1754,7 +1753,7 @@ static bool api_RNetShareGetInfo(connection_struct *conn,uint16 vuid,
 	SSVAL(*rparam,0,NERR_Success);
 	SSVAL(*rparam,2,0);		/* converter word */
 	SSVAL(*rparam,4,*rdata_len);
- 
+
 	return True;
 }
 
@@ -1790,7 +1789,7 @@ static bool api_RNetShareEnum( connection_struct *conn, uint16 vuid,
 	int i;
 	int data_len, fixed_len, string_len;
 	int f_len = 0, s_len = 0;
- 
+
 	if (!str1 || !str2 || !p) {
 		return False;
 	}
@@ -1801,7 +1800,7 @@ static bool api_RNetShareEnum( connection_struct *conn, uint16 vuid,
 	if (!check_share_info(uLevel,str2)) {
 		return False;
 	}
-  
+
 	/* Ensure all the usershares are loaded. */
 	become_root();
 	load_registry_shares();
@@ -1834,7 +1833,7 @@ static bool api_RNetShareEnum( connection_struct *conn, uint16 vuid,
 	if (!*rdata) {
 		return False;
 	}
- 
+
 	p2 = (*rdata) + fixed_len;	/* auxiliary data (strings) will go here */
 	p = *rdata;
 	f_len = fixed_len;
@@ -1853,7 +1852,7 @@ static bool api_RNetShareEnum( connection_struct *conn, uint16 vuid,
 			}
 		}
 	}
-  
+
 	*rparam_len = 8;
 	*rparam = smb_realloc_limit(*rparam,*rparam_len);
 	if (!*rparam) {
@@ -1863,7 +1862,7 @@ static bool api_RNetShareEnum( connection_struct *conn, uint16 vuid,
 	SSVAL(*rparam,2,0);
 	SSVAL(*rparam,4,counted);
 	SSVAL(*rparam,6,total);
-  
+
 	DEBUG(3,("RNetShareEnum gave %d entries of %d (%d %d %d %d)\n",
 		counted,total,uLevel,
 		buf_len,*rdata_len,mdrcnt));
@@ -2004,7 +2003,7 @@ static bool api_RNetShareAdd(connection_struct *conn,uint16 vuid,
 	SSVAL(*rparam,2,0);		/* converter word */
 	SSVAL(*rparam,4,*rdata_len);
 	*rdata_len = 0;
-  
+
 	return True;
 
   error_exit:
@@ -2042,7 +2041,7 @@ static bool api_RNetGroupEnum(connection_struct *conn,uint16 vuid,
 	struct samr_displayentry *entries;
 
 	int num_entries;
- 
+
 	if (!str1 || !str2 || !p) {
 		return False;
 	}
@@ -2538,7 +2537,7 @@ static bool api_SetUserPassword(connection_struct *conn,uint16 vuid,
 
 	memset((char *)pass1,'\0',sizeof(fstring));
 	memset((char *)pass2,'\0',sizeof(fstring));	 
-	 
+
 	return(True);
 }
 
@@ -2677,7 +2676,7 @@ static bool api_RDosPrintJobDel(connection_struct *conn,uint16 vuid,
 	}
 
 	errcode = NERR_notsupported;
-	
+
 	switch (function) {
 	case 81:		/* delete */ 
 		if (print_job_delete(conn->server_info, snum, jobid, &werr))
@@ -2695,7 +2694,7 @@ static bool api_RDosPrintJobDel(connection_struct *conn,uint16 vuid,
 
 	if (!W_ERROR_IS_OK(werr))
 		errcode = W_ERROR_V(werr);
-	
+
  out:
 	SSVAL(*rparam,0,errcode);	
 	SSVAL(*rparam,2,0);		/* converter word */
@@ -2845,9 +2844,9 @@ static bool api_PrintJobInfo(connection_struct *conn, uint16 vuid,
 			 sharename));
 		return False;
 	}
-  
+
 	*rdata_len = 0;
-	
+
 	/* check it's a supported varient */
 	if ((strcmp(str1,"WWsTP")) || 
 	    (!check_printjob_info(&desc,uLevel,str2)))
@@ -2884,7 +2883,7 @@ static bool api_PrintJobInfo(connection_struct *conn, uint16 vuid,
  out:
 	SSVALS(*rparam,0,errcode);
 	SSVAL(*rparam,2,0);		/* converter word */
-	
+
 	return(True);
 }
 
@@ -3638,7 +3637,7 @@ static bool api_WWkstaUserLogon(connection_struct *conn,uint16 vuid,
 	desc.buflen = mdrcnt;
 	desc.subformat = NULL;
 	desc.format = str2;
-  
+
 	if (init_package(&desc,1,0)) {
 		PACKI(&desc,"W",0);		/* code */
 		PACKS(&desc,"B21",name);	/* eff. name */
@@ -3870,11 +3869,11 @@ static bool api_WPrintJobEnumerate(connection_struct *conn, uint16 vuid,
 	if (strcmp(str1,"zWrLeh") != 0) {
 		return False;
 	}
-    
+
 	if (uLevel > 2) {
 		return False;	/* defined only for uLevel 0,1,2 */
 	}
-    
+
 	if (!check_printjob_info(&desc,uLevel,str2)) { 
 		return False;
 	}