s3: Fix some nonempty blank lines

1 files changed, 199 insertions, 210 deletions

diff --git a/source3/libsmb/libsmb_xattr.c b/source3/libsmb/libsmb_xattr.c
index 0e2ffda7a2..27c3e12399 100644
--- a/source3/libsmb/libsmb_xattr.c
+++ b/source3/libsmb/libsmb_xattr.c
@@ -7,17 +7,17 @@
    Copyright (C) Tom Jansen (Ninja ISD) 2002 
    Copyright (C) Derrell Lipman 2003-2008
    Copyright (C) Jeremy Allison 2007, 2008
-   
+
    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/>.
 */
@@ -34,17 +34,15 @@ static struct rpc_pipe_client *
 find_lsa_pipe_hnd(struct cli_state *ipc_cli)
 {
 	struct rpc_pipe_client *pipe_hnd;
-        
+
 	for (pipe_hnd = ipc_cli->pipe_list;
              pipe_hnd;
              pipe_hnd = pipe_hnd->next) {
-                
 		if (ndr_syntax_id_equal(&pipe_hnd->abstract_syntax,
 					&ndr_table_lsarpc.syntax_id)) {
 			return pipe_hnd;
 		}
 	}
-        
 	return NULL;
 }
 
@@ -60,19 +58,19 @@ ace_compare(SEC_ACE *ace1,
 {
         bool b1;
         bool b2;
-        
+
         /* If the ACEs are equal, we have nothing more to do. */
         if (sec_ace_equal(ace1, ace2)) {
 		return 0;
         }
-        
+
         /* Inherited follow non-inherited */
         b1 = ((ace1->flags & SEC_ACE_FLAG_INHERITED_ACE) != 0);
         b2 = ((ace2->flags & SEC_ACE_FLAG_INHERITED_ACE) != 0);
         if (b1 != b2) {
                 return (b1 ? 1 : -1);
         }
-        
+
         /*
          * What shall we do with AUDITs and ALARMs?  It's undefined.  We'll
          * sort them after DENY and ALLOW.
@@ -88,7 +86,7 @@ ace_compare(SEC_ACE *ace1,
         if (b1 != b2) {
                 return (b1 ? 1 : -1);
         }
-        
+
         /* Allowed ACEs follow denied ACEs */
         b1 = (ace1->type == SEC_ACE_TYPE_ACCESS_ALLOWED ||
               ace1->type == SEC_ACE_TYPE_ACCESS_ALLOWED_OBJECT);
@@ -97,7 +95,7 @@ ace_compare(SEC_ACE *ace1,
         if (b1 != b2) {
                 return (b1 ? 1 : -1);
         }
-        
+
         /*
          * ACEs applying to an entity's object follow those applying to the
          * entity itself
@@ -109,34 +107,34 @@ ace_compare(SEC_ACE *ace1,
         if (b1 != b2) {
                 return (b1 ? 1 : -1);
         }
-        
+
         /*
          * If we get this far, the ACEs are similar as far as the
          * characteristics we typically care about (those defined by the
          * referenced MS document).  We'll now sort by characteristics that
          * just seems reasonable.
          */
-        
+
 	if (ace1->type != ace2->type) {
 		return ace2->type - ace1->type;
         }
-        
+
 	if (sid_compare(&ace1->trustee, &ace2->trustee)) {
 		return sid_compare(&ace1->trustee, &ace2->trustee);
         }
-        
+
 	if (ace1->flags != ace2->flags) {
 		return ace1->flags - ace2->flags;
         }
-        
+
 	if (ace1->access_mask != ace2->access_mask) {
 		return ace1->access_mask - ace2->access_mask;
         }
-        
+
 	if (ace1->size != ace2->size) {
 		return ace1->size - ace2->size;
         }
-        
+
 	return memcmp(ace1, ace2, sizeof(SEC_ACE));
 }
 
@@ -146,10 +144,10 @@ sort_acl(SEC_ACL *the_acl)
 {
 	uint32 i;
 	if (!the_acl) return;
-        
+
 	qsort(the_acl->aces, the_acl->num_aces, sizeof(the_acl->aces[0]),
               QSORT_CAST ace_compare);
-        
+
 	for (i=1;i<the_acl->num_aces;) {
 		if (sec_ace_equal(&the_acl->aces[i-1], &the_acl->aces[i])) {
 			int j;
@@ -176,21 +174,21 @@ convert_sid_to_string(struct cli_state *ipc_cli,
 	enum lsa_SidType *types = NULL;
 	struct rpc_pipe_client *pipe_hnd = find_lsa_pipe_hnd(ipc_cli);
 	TALLOC_CTX *ctx;
-        
+
 	sid_to_fstring(str, sid);
-        
+
 	if (numeric) {
 		return;     /* no lookup desired */
 	}
-        
+
 	if (!pipe_hnd) {
 		return;
 	}
-        
+
 	/* Ask LSA to convert the sid to a name */
-        
+
 	ctx = talloc_stackframe();
-        
+
 	if (!NT_STATUS_IS_OK(rpccli_lsa_lookup_sids(pipe_hnd, ctx,
                                                     pol, 1, sid, &domains,
                                                     &names, &types)) ||
@@ -198,9 +196,9 @@ convert_sid_to_string(struct cli_state *ipc_cli,
 		TALLOC_FREE(ctx);
 		return;
 	}
-        
+
 	/* Converted OK */
-        
+
 	slprintf(str, sizeof(fstring) - 1, "%s%s%s",
 		 domains[0], lp_winbind_separator(),
 		 names[0]);
@@ -221,20 +219,20 @@ convert_string_to_sid(struct cli_state *ipc_cli,
 	bool result = True;
 	TALLOC_CTX *ctx = NULL;
 	struct rpc_pipe_client *pipe_hnd = find_lsa_pipe_hnd(ipc_cli);
-        
+
 	if (!pipe_hnd) {
 		return False;
 	}
-        
+
         if (numeric) {
                 if (strncmp(str, "S-", 2) == 0) {
                         return string_to_sid(sid, str);
                 }
-                
+
                 result = False;
                 goto done;
         }
-        
+
 	ctx = talloc_stackframe();
 	if (!NT_STATUS_IS_OK(rpccli_lsa_lookup_names(pipe_hnd, ctx,
                                                      pol, 1, &str,
@@ -243,10 +241,9 @@ convert_string_to_sid(struct cli_state *ipc_cli,
 		result = False;
 		goto done;
 	}
-        
+
 	sid_copy(sid, &sids[0]);
 done:
-        
 	TALLOC_FREE(ctx);
 	return result;
 }
@@ -274,7 +271,7 @@ parse_ace(struct cli_state *ipc_cli,
                 uint32 mask;
         };
 	TALLOC_CTX *frame = talloc_stackframe();
-        
+
         /* These values discovered by inspection */
         static const struct perm_value special_values[] = {
                 { "R", 0x00120089 },
@@ -285,15 +282,14 @@ parse_ace(struct cli_state *ipc_cli,
                 { "O", 0x00080000 },
                 { "", 0 },
         };
-        
+
         static const struct perm_value standard_values[] = {
                 { "READ",   0x001200a9 },
                 { "CHANGE", 0x001301bf },
                 { "FULL",   0x001f01ff },
                 { "", 0 },
         };
-        
-        
+
 	ZERO_STRUCTP(ace);
 	p = strchr_m(str,':');
 	if (!p) {
@@ -303,25 +299,25 @@ parse_ace(struct cli_state *ipc_cli,
 	*p = '\0';
 	p++;
 	/* Try to parse numeric form */
-        
+
 	if (sscanf(p, "%i/%i/%i", &atype, &aflags, &amask) == 3 &&
 	    convert_string_to_sid(ipc_cli, pol, numeric, &sid, str)) {
 		goto done;
 	}
-        
+
 	/* Try to parse text form */
-        
+
 	if (!convert_string_to_sid(ipc_cli, pol, numeric, &sid, str)) {
 		TALLOC_FREE(frame);
 		return false;
 	}
-        
+
 	cp = p;
 	if (!next_token_talloc(frame, &cp, &tok, "/")) {
 		TALLOC_FREE(frame);
 		return false;
 	}
-        
+
 	if (StrnCaseCmp(tok, "ALLOWED", strlen("ALLOWED")) == 0) {
 		atype = SEC_ACE_TYPE_ACCESS_ALLOWED;
 	} else if (StrnCaseCmp(tok, "DENIED", strlen("DENIED")) == 0) {
@@ -330,20 +326,20 @@ parse_ace(struct cli_state *ipc_cli,
 		TALLOC_FREE(frame);
 		return false;
 	}
-        
+
 	/* Only numeric form accepted for flags at present */
-        
+
 	if (!(next_token_talloc(frame, &cp, &tok, "/") &&
 	      sscanf(tok, "%i", &aflags))) {
 		TALLOC_FREE(frame);
 		return false;
 	}
-        
+
 	if (!next_token_talloc(frame, &cp, &tok, "/")) {
 		TALLOC_FREE(frame);
 		return false;
 	}
-        
+
 	if (strncmp(tok, "0x", 2) == 0) {
 		if (sscanf(tok, "%i", &amask) != 1) {
 			TALLOC_FREE(frame);
@@ -351,38 +347,38 @@ parse_ace(struct cli_state *ipc_cli,
 		}
 		goto done;
 	}
-        
+
 	for (v = standard_values; v->perm; v++) {
 		if (strcmp(tok, v->perm) == 0) {
 			amask = v->mask;
 			goto done;
 		}
 	}
-        
+
 	p = tok;
-        
+
 	while(*p) {
 		bool found = False;
-                
+
 		for (v = special_values; v->perm; v++) {
 			if (v->perm[0] == *p) {
 				amask |= v->mask;
 				found = True;
 			}
 		}
-                
+
 		if (!found) {
 			TALLOC_FREE(frame);
 		 	return false;
 		}
 		p++;
 	}
-        
+
 	if (*p) {
 		TALLOC_FREE(frame);
 		return false;
 	}
-        
+
 done:
 	mask = amask;
 	init_sec_ace(ace, &sid, atype, mask, aflags);
@@ -398,12 +394,12 @@ add_ace(SEC_ACL **the_acl,
 {
 	SEC_ACL *newacl;
 	SEC_ACE *aces;
-        
+
 	if (! *the_acl) {
 		(*the_acl) = make_sec_acl(ctx, 3, 1, ace);
 		return True;
 	}
-        
+
 	if ((aces = SMB_CALLOC_ARRAY(SEC_ACE,
                                      1+(*the_acl)->num_aces)) == NULL) {
 		return False;
@@ -434,14 +430,14 @@ sec_desc_parse(TALLOC_CTX *ctx,
         DOM_SID *owner_sid=NULL;
 	SEC_ACL *dacl=NULL;
 	int revision=1;
-        
+
 	while (next_token_talloc(ctx, &p, &tok, "\t,\r\n")) {
-                
+
 		if (StrnCaseCmp(tok,"REVISION:", 9) == 0) {
 			revision = strtol(tok+9, NULL, 16);
 			continue;
 		}
-                
+
 		if (StrnCaseCmp(tok,"OWNER:", 6) == 0) {
 			if (owner_sid) {
 				DEBUG(5,("OWNER specified more than once!\n"));
@@ -457,7 +453,7 @@ sec_desc_parse(TALLOC_CTX *ctx,
 			}
 			continue;
 		}
-                
+
 		if (StrnCaseCmp(tok,"OWNER+:", 7) == 0) {
 			if (owner_sid) {
 				DEBUG(5,("OWNER specified more than once!\n"));
@@ -473,7 +469,7 @@ sec_desc_parse(TALLOC_CTX *ctx,
 			}
 			continue;
 		}
-                
+
 		if (StrnCaseCmp(tok,"GROUP:", 6) == 0) {
 			if (group_sid) {
 				DEBUG(5,("GROUP specified more than once!\n"));
@@ -489,7 +485,7 @@ sec_desc_parse(TALLOC_CTX *ctx,
 			}
 			continue;
 		}
-                
+
 		if (StrnCaseCmp(tok,"GROUP+:", 7) == 0) {
 			if (group_sid) {
 				DEBUG(5,("GROUP specified more than once!\n"));
@@ -505,7 +501,7 @@ sec_desc_parse(TALLOC_CTX *ctx,
 			}
 			continue;
 		}
-                
+
 		if (StrnCaseCmp(tok,"ACL:", 4) == 0) {
 			SEC_ACE ace;
 			if (!parse_ace(ipc_cli, pol, &ace, numeric, tok+4)) {
@@ -518,7 +514,7 @@ sec_desc_parse(TALLOC_CTX *ctx,
 			}
 			continue;
 		}
-                
+
 		if (StrnCaseCmp(tok,"ACL+:", 5) == 0) {
 			SEC_ACE ace;
 			if (!parse_ace(ipc_cli, pol, &ace, False, tok+5)) {
@@ -531,18 +527,17 @@ sec_desc_parse(TALLOC_CTX *ctx,
 			}
 			continue;
 		}
-                
+
 		DEBUG(5, ("Failed to parse security descriptor\n"));
 		goto done;
 	}
-        
+
 	ret = make_sec_desc(ctx, revision, SEC_DESC_SELF_RELATIVE, 
 			    owner_sid, group_sid, NULL, dacl, &sd_size);
-        
+
 done:
 	SAFE_FREE(group_sid);
 	SAFE_FREE(owner_sid);
-        
 	return ret;
 }
 
@@ -562,13 +557,13 @@ dos_attr_query(SMBCCTX *context,
         uint16 mode = 0;
 	SMB_INO_T inode = 0;
         DOS_ATTR_DESC *ret;
-        
+
         ret = TALLOC_P(ctx, DOS_ATTR_DESC);
         if (!ret) {
                 errno = ENOMEM;
                 return NULL;
         }
-        
+
         /* Obtain the DOS attributes */
         if (!SMBC_getatr(context, srv, CONST_DISCARD(char *, filename),
                          &mode, &size,
@@ -581,7 +576,7 @@ dos_attr_query(SMBCCTX *context,
                 DEBUG(5, ("dos_attr_query Failed to query old attributes\n"));
                 return NULL;
         }
-        
+
         ret->mode = mode;
         ret->size = size;
         ret->create_time = convert_timespec_to_time_t(create_time_ts);
@@ -589,7 +584,7 @@ dos_attr_query(SMBCCTX *context,
         ret->write_time = convert_timespec_to_time_t(write_time_ts);
         ret->change_time = convert_timespec_to_time_t(change_time_ts);
         ret->inode = inode;
-        
+
         return ret;
 }
 
@@ -611,7 +606,7 @@ dos_attr_parse(SMBCCTX *context,
                 const char * write_time_attr;
                 const char * change_time_attr;
         } attr_strings;
-        
+
         /* Determine whether to use old-style or new-style attribute names */
         if (context->internal->full_time_names) {
                 /* new-style names */
@@ -626,7 +621,7 @@ dos_attr_parse(SMBCCTX *context,
                 attr_strings.write_time_attr = "M_TIME";
                 attr_strings.change_time_attr = "C_TIME";
         }
-        
+
         /* if this is to set the entire ACL... */
         if (*str == '*') {
                 /* ... then increment past the first colon if there is one */
@@ -636,7 +631,7 @@ dos_attr_parse(SMBCCTX *context,
                         p = str;
                 }
         }
-        
+
 	frame = talloc_stackframe();
 	while (next_token_talloc(frame, &p, &tok, "\t,\r\n")) {
 		if (StrnCaseCmp(tok, "MODE:", 5) == 0) {
@@ -651,30 +646,30 @@ dos_attr_parse(SMBCCTX *context,
                         }
 			continue;
 		}
-                
+
 		if (StrnCaseCmp(tok, "SIZE:", 5) == 0) {
                         dad->size = (SMB_OFF_T)atof(tok+5);
 			continue;
 		}
-                
+
                 n = strlen(attr_strings.access_time_attr);
                 if (StrnCaseCmp(tok, attr_strings.access_time_attr, n) == 0) {
                         dad->access_time = (time_t)strtol(tok+n+1, NULL, 10);
 			continue;
 		}
-                
+
                 n = strlen(attr_strings.change_time_attr);
                 if (StrnCaseCmp(tok, attr_strings.change_time_attr, n) == 0) {
                         dad->change_time = (time_t)strtol(tok+n+1, NULL, 10);
 			continue;
 		}
-                
+
                 n = strlen(attr_strings.write_time_attr);
                 if (StrnCaseCmp(tok, attr_strings.write_time_attr, n) == 0) {
                         dad->write_time = (time_t)strtol(tok+n+1, NULL, 10);
 			continue;
 		}
-                
+
 		if (attr_strings.create_time_attr != NULL) {
 			n = strlen(attr_strings.create_time_attr);
 			if (StrnCaseCmp(tok, attr_strings.create_time_attr,
@@ -684,7 +679,7 @@ dos_attr_parse(SMBCCTX *context,
 				continue;
 			}
 		}
-                
+
 		if (StrnCaseCmp(tok, "INODE:", 6) == 0) {
                         dad->inode = (SMB_INO_T)atof(tok+6);
 			continue;
@@ -761,7 +756,7 @@ cacl_get(SMBCCTX *context,
                 const char * write_time_attr;
                 const char * change_time_attr;
         } excl_attr_strings;
-        
+
         /* Determine whether to use old-style or new-style attribute names */
         if (context->internal->full_time_names) {
                 /* new-style names */
@@ -769,7 +764,7 @@ cacl_get(SMBCCTX *context,
                 attr_strings.access_time_attr = "ACCESS_TIME";
                 attr_strings.write_time_attr = "WRITE_TIME";
                 attr_strings.change_time_attr = "CHANGE_TIME";
-                
+
                 excl_attr_strings.create_time_attr = "CREATE_TIME";
                 excl_attr_strings.access_time_attr = "ACCESS_TIME";
                 excl_attr_strings.write_time_attr = "WRITE_TIME";
@@ -780,28 +775,28 @@ cacl_get(SMBCCTX *context,
                 attr_strings.access_time_attr = "A_TIME";
                 attr_strings.write_time_attr = "M_TIME";
                 attr_strings.change_time_attr = "C_TIME";
-                
+
                 excl_attr_strings.create_time_attr = NULL;
                 excl_attr_strings.access_time_attr = "dos_attr.A_TIME";
                 excl_attr_strings.write_time_attr = "dos_attr.M_TIME";
                 excl_attr_strings.change_time_attr = "dos_attr.C_TIME";
         }
-        
+
         /* Copy name so we can strip off exclusions (if any are specified) */
         strncpy(name_sandbox, attr_name, sizeof(name_sandbox) - 1);
-        
+
         /* Ensure name is null terminated */
         name_sandbox[sizeof(name_sandbox) - 1] = '\0';
-        
+
         /* Play in the sandbox */
         name = name_sandbox;
-        
+
         /* If there are any exclusions, point to them and mask them from name */
         if ((pExclude = strchr(name, '!')) != NULL)
         {
                 *pExclude++ = '\0';
         }
-        
+
         all = (StrnCaseCmp(name, "system.*", 8) == 0);
         all_nt = (StrnCaseCmp(name, "system.nt_sec_desc.*", 20) == 0);
         all_nt_acls = (StrnCaseCmp(name, "system.nt_sec_desc.acl.*", 24) == 0);
@@ -809,21 +804,20 @@ cacl_get(SMBCCTX *context,
         some_nt = (StrnCaseCmp(name, "system.nt_sec_desc.", 19) == 0);
         some_dos = (StrnCaseCmp(name, "system.dos_attr.", 16) == 0);
         numeric = (* (name + strlen(name) - 1) != '+');
-        
+
         /* Look for exclusions from "all" requests */
         if (all || all_nt || all_dos) {
-                
                 /* Exclusions are delimited by '!' */
                 for (;
                      pExclude != NULL;
                      pExclude = (p == NULL ? NULL : p + 1)) {
-                        
+
                         /* Find end of this exclusion name */
                         if ((p = strchr(pExclude, '!')) != NULL)
                         {
                                 *p = '\0';
                         }
-                        
+
                         /* Which exclusion name is this? */
                         if (StrCaseCmp(pExclude,
                                        "nt_sec_desc.revision") == 0) {
@@ -877,9 +871,9 @@ cacl_get(SMBCCTX *context,
                         }
                 }
         }
-        
+
         n_used = 0;
-        
+
         /*
          * If we are (possibly) talking to an NT or new system and some NT
          * attributes have been requested...
@@ -950,7 +944,7 @@ cacl_get(SMBCCTX *context,
                                                      sd->revision);
                                 }
                         }
-                        
+
                         if (!determine_size && n > bufsize) {
                                 errno = ERANGE;
                                 return -1;
@@ -960,7 +954,7 @@ cacl_get(SMBCCTX *context,
                         bufsize -= n;
                         n = 0;
                 }
-                
+
                 if (! exclude_nt_owner) {
                         /* Get owner and group sid */
                         if (sd->owner_sid) {
@@ -971,7 +965,7 @@ cacl_get(SMBCCTX *context,
                         } else {
                                 fstrcpy(sidstr, "");
                         }
-                        
+
                         if (all || all_nt) {
                                 if (determine_size) {
                                         p = talloc_asprintf(ctx, ",OWNER:%s",
@@ -998,7 +992,7 @@ cacl_get(SMBCCTX *context,
                                                      sidstr);
                                 }
                         }
-                        
+
                         if (!determine_size && n > bufsize) {
                                 errno = ERANGE;
                                 return -1;
@@ -1008,7 +1002,7 @@ cacl_get(SMBCCTX *context,
                         bufsize -= n;
                         n = 0;
                 }
-                
+
                 if (! exclude_nt_group) {
                         if (sd->group_sid) {
                                 convert_sid_to_string(ipc_cli, pol,
@@ -1017,7 +1011,7 @@ cacl_get(SMBCCTX *context,
                         } else {
                                 fstrcpy(sidstr, "");
                         }
-                        
+
                         if (all || all_nt) {
                                 if (determine_size) {
                                         p = talloc_asprintf(ctx, ",GROUP:%s",
@@ -1044,7 +1038,7 @@ cacl_get(SMBCCTX *context,
                                                      "%s", sidstr);
                                 }
                         }
-                        
+
                         if (!determine_size && n > bufsize) {
                                 errno = ERANGE;
                                 return -1;
@@ -1054,16 +1048,16 @@ cacl_get(SMBCCTX *context,
                         bufsize -= n;
                         n = 0;
                 }
-                
+
                 if (! exclude_nt_acl) {
                         /* Add aces to value buffer  */
                         for (i = 0; sd->dacl && i < sd->dacl->num_aces; i++) {
-                                
+
                                 SEC_ACE *ace = &sd->dacl->aces[i];
                                 convert_sid_to_string(ipc_cli, pol,
                                                       sidstr, numeric,
                                                       &ace->trustee);
-                                
+
                                 if (all || all_nt) {
                                         if (determine_size) {
                                                 p = talloc_asprintf(
@@ -1146,15 +1140,15 @@ cacl_get(SMBCCTX *context,
                                 n = 0;
                         }
                 }
-                
+
                 /* Restore name pointer to its original value */
                 name -= 19;
         }
-        
+
         if (all || some_dos) {
                 /* Point to the portion after "system.dos_attr." */
                 name += 16;     /* if (all) this will be invalid but unused */
-                
+
                 /* Obtain the DOS attributes */
                 if (!SMBC_getatr(context, srv, filename, &mode, &size, 
                                  &create_time_ts,
@@ -1162,17 +1156,16 @@ cacl_get(SMBCCTX *context,
                                  &write_time_ts,
                                  &change_time_ts,
                                  &ino)) {
-                        
+
                         errno = SMBC_errno(context, srv->cli);
                         return -1;
-                        
                 }
-                
+
                 create_time = convert_timespec_to_time_t(create_time_ts);
                 access_time = convert_timespec_to_time_t(access_time_ts);
                 write_time = convert_timespec_to_time_t(write_time_ts);
                 change_time = convert_timespec_to_time_t(change_time_ts);
-                
+
                 if (! exclude_dos_mode) {
                         if (all || all_dos) {
                                 if (determine_size) {
@@ -1210,7 +1203,7 @@ cacl_get(SMBCCTX *context,
                                                      "0x%x", mode);
                                 }
                         }
-                        
+
                         if (!determine_size && n > bufsize) {
                                 errno = ERANGE;
                                 return -1;
@@ -1220,7 +1213,7 @@ cacl_get(SMBCCTX *context,
                         bufsize -= n;
                         n = 0;
                 }
-                
+
                 if (! exclude_dos_size) {
                         if (all || all_dos) {
                                 if (determine_size) {
@@ -1255,7 +1248,7 @@ cacl_get(SMBCCTX *context,
                                                      (double)size);
                                 }
                         }
-                        
+
                         if (!determine_size && n > bufsize) {
                                 errno = ERANGE;
                                 return -1;
@@ -1265,7 +1258,7 @@ cacl_get(SMBCCTX *context,
                         bufsize -= n;
                         n = 0;
                 }
-                
+
                 if (! exclude_dos_create_time &&
                     attr_strings.create_time_attr != NULL) {
                         if (all || all_dos) {
@@ -1298,7 +1291,7 @@ cacl_get(SMBCCTX *context,
                                                      "%lu", (unsigned long) create_time);
                                 }
                         }
-                        
+
                         if (!determine_size && n > bufsize) {
                                 errno = ERANGE;
                                 return -1;
@@ -1308,7 +1301,7 @@ cacl_get(SMBCCTX *context,
                         bufsize -= n;
                         n = 0;
                 }
-                
+
                 if (! exclude_dos_access_time) {
                         if (all || all_dos) {
                                 if (determine_size) {
@@ -1340,7 +1333,7 @@ cacl_get(SMBCCTX *context,
                                                      "%lu", (unsigned long) access_time);
                                 }
                         }
-                        
+
                         if (!determine_size && n > bufsize) {
                                 errno = ERANGE;
                                 return -1;
@@ -1350,7 +1343,7 @@ cacl_get(SMBCCTX *context,
                         bufsize -= n;
                         n = 0;
                 }
-                
+
                 if (! exclude_dos_write_time) {
                         if (all || all_dos) {
                                 if (determine_size) {
@@ -1382,7 +1375,7 @@ cacl_get(SMBCCTX *context,
                                                      "%lu", (unsigned long) write_time);
                                 }
                         }
-                        
+
                         if (!determine_size && n > bufsize) {
                                 errno = ERANGE;
                                 return -1;
@@ -1392,7 +1385,7 @@ cacl_get(SMBCCTX *context,
                         bufsize -= n;
                         n = 0;
                 }
-                
+
                 if (! exclude_dos_change_time) {
                         if (all || all_dos) {
                                 if (determine_size) {
@@ -1424,7 +1417,7 @@ cacl_get(SMBCCTX *context,
                                                      "%lu", (unsigned long) change_time);
                                 }
                         }
-                        
+
                         if (!determine_size && n > bufsize) {
                                 errno = ERANGE;
                                 return -1;
@@ -1434,7 +1427,7 @@ cacl_get(SMBCCTX *context,
                         bufsize -= n;
                         n = 0;
                 }
-                
+
                 if (! exclude_dos_inode) {
                         if (all || all_dos) {
                                 if (determine_size) {
@@ -1469,7 +1462,7 @@ cacl_get(SMBCCTX *context,
                                                      (double) ino);
                                 }
                         }
-                        
+
                         if (!determine_size && n > bufsize) {
                                 errno = ERANGE;
                                 return -1;
@@ -1479,16 +1472,16 @@ cacl_get(SMBCCTX *context,
                         bufsize -= n;
                         n = 0;
                 }
-                
+
                 /* Restore name pointer to its original value */
                 name -= 16;
         }
-        
+
         if (n_used == 0) {
                 errno = ENOATTR;
                 return -1;
         }
-        
+
 	return n_used;
 }
 
@@ -1525,24 +1518,23 @@ cacl_set(SMBCCTX *context,
                 numeric = ((p = strchr(the_acl, ':')) != NULL &&
                            p > the_acl &&
                            p[-1] != '+');
-                
+
                 /* if this is to set the entire ACL... */
                 if (*the_acl == '*') {
                         /* ... then increment past the first colon */
                         the_acl = p + 1;
                 }
-                
+
                 sd = sec_desc_parse(ctx, ipc_cli, pol, numeric, the_acl);
-                
                 if (!sd) {
 			errno = EINVAL;
 			return -1;
                 }
         }
-        
+
 	/* SMBC_XATTR_MODE_REMOVE_ALL is the only caller
 	   that doesn't deref sd */
-        
+
 	if (!sd && (mode != SMBC_XATTR_MODE_REMOVE_ALL)) {
 		errno = EINVAL;
 		return -1;
@@ -1601,7 +1593,7 @@ cacl_set(SMBCCTX *context,
 					break;
 				}
 			}
-                        
+
 			if (!found) {
                                 err = ENOATTR;
                                 ret = -1;
@@ -1609,11 +1601,11 @@ cacl_set(SMBCCTX *context,
 			}
 		}
 		break;
-                
+
 	case SMBC_XATTR_MODE_ADD:
 		for (i=0;sd->dacl && i<sd->dacl->num_aces;i++) {
 			bool found = False;
-                        
+
 			for (j=0;old->dacl && j<old->dacl->num_aces;j++) {
 				if (sid_equal(&sd->dacl->aces[i].trustee,
 					      &old->dacl->aces[j].trustee)) {
@@ -1627,43 +1619,43 @@ cacl_set(SMBCCTX *context,
 					found = True;
 				}
 			}
-                        
+
 			if (!found && (flags & SMBC_XATTR_FLAG_REPLACE)) {
                                 err = ENOATTR;
                                 ret = -1;
                                 goto failed;
 			}
-                        
+
                         for (i=0;sd->dacl && i<sd->dacl->num_aces;i++) {
                                 add_ace(&old->dacl, &sd->dacl->aces[i], ctx);
                         }
 		}
                 dacl = old->dacl;
 		break;
-                
+
 	case SMBC_XATTR_MODE_SET:
  		old = sd;
                 owner_sid = old->owner_sid;
                 group_sid = old->group_sid;
                 dacl = old->dacl;
 		break;
-                
+
         case SMBC_XATTR_MODE_CHOWN:
                 owner_sid = sd->owner_sid;
                 break;
-                
+
         case SMBC_XATTR_MODE_CHGRP:
                 group_sid = sd->group_sid;
                 break;
 	}
-        
+
 	/* Denied ACE entries must come before allowed ones */
 	sort_acl(old->dacl);
-        
+
 	/* Create new security descriptor and set it */
 	sd = make_sec_desc(ctx, old->revision, SEC_DESC_SELF_RELATIVE,
 			   owner_sid, group_sid, NULL, dacl, &sd_size);
-        
+
 	if (!NT_STATUS_IS_OK(cli_ntcreate(targetcli, targetpath, 0,
                              WRITE_DAC_ACCESS | WRITE_OWNER_ACCESS, 0,
 			     FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0x0, 0x0, &fnum))) {
@@ -1672,22 +1664,22 @@ cacl_set(SMBCCTX *context,
                 errno = 0;
 		return -1;
 	}
-        
+
 	if (!cli_set_secdesc(targetcli, fnum, sd)) {
 		DEBUG(5, ("ERROR: secdesc set failed: %s\n",
 			cli_errstr(targetcli)));
 		ret = -1;
 	}
-        
+
 	/* Clean up */
-        
+
 failed:
 	cli_close(targetcli, fnum);
-        
+
         if (err != 0) {
                 errno = err;
         }
-        
+
 	return ret;
 }
 
@@ -1718,23 +1710,22 @@ SMBC_setxattr_ctx(SMBCCTX *context,
                 const char * change_time_attr;
         } attr_strings;
         TALLOC_CTX *frame = talloc_stackframe();
-        
+
 	if (!context || !context->internal->initialized) {
-                
 		errno = EINVAL;  /* Best I can think of ... */
 		TALLOC_FREE(frame);
 		return -1;
 	}
-        
+
 	if (!fname) {
 		errno = EINVAL;
 		TALLOC_FREE(frame);
 		return -1;
 	}
-        
+
 	DEBUG(4, ("smbc_setxattr(%s, %s, %.*s)\n",
                   fname, name, (int) size, (const char*)value));
-        
+
 	if (SMBC_parse_path(frame,
                             context,
                             fname,
@@ -1749,7 +1740,7 @@ SMBC_setxattr_ctx(SMBCCTX *context,
 		TALLOC_FREE(frame);
 		return -1;
         }
-        
+
 	if (!user || user[0] == (char)0) {
 		user = talloc_strdup(frame, smbc_getUser(context));
 		if (!user) {
@@ -1758,14 +1749,14 @@ SMBC_setxattr_ctx(SMBCCTX *context,
 			return -1;
 		}
 	}
-        
+
 	srv = SMBC_server(frame, context, True,
                           server, share, &workgroup, &user, &password);
 	if (!srv) {
 		TALLOC_FREE(frame);
 		return -1;  /* errno set by SMBC_server */
 	}
-        
+
         if (! srv->no_nt_session) {
                 ipc_srv = SMBC_attr_server(frame, context, server, share,
                                            &workgroup, &user, &password);
@@ -1775,7 +1766,7 @@ SMBC_setxattr_ctx(SMBCCTX *context,
         } else {
                 ipc_srv = NULL;
         }
-        
+
         /*
          * Are they asking to set the entire set of known attributes?
          */
@@ -1791,7 +1782,7 @@ SMBC_setxattr_ctx(SMBCCTX *context,
 			TALLOC_FREE(frame);
                         return -1;
                 }
-                
+
                 if (ipc_srv) {
                         ret = cacl_set(context, talloc_tos(), srv->cli,
                                        ipc_srv->cli, &ipc_srv->pol, path,
@@ -1803,13 +1794,13 @@ SMBC_setxattr_ctx(SMBCCTX *context,
                 } else {
                         ret = 0;
                 }
-                
+
                 /* get a DOS Attribute Descriptor with current attributes */
                 dad = dos_attr_query(context, talloc_tos(), path, srv);
                 if (dad) {
                         /* Overwrite old with new, using what was provided */
                         dos_attr_parse(context, dad, srv, namevalue);
-                        
+
                         /* Set the new DOS attributes */
                         if (! SMBC_setatr(context, srv, path,
                                           dad->create_time,
@@ -1817,12 +1808,12 @@ SMBC_setxattr_ctx(SMBCCTX *context,
                                           dad->write_time,
                                           dad->change_time,
                                           dad->mode)) {
-                                
+
                                 /* cause failure if NT failed too */
                                 dad = NULL; 
                         }
                 }
-                
+
                 /* we only fail if both NT and DOS sets failed */
                 if (ret < 0 && ! dad) {
                         ret = -1; /* in case dad was null */
@@ -1830,11 +1821,11 @@ SMBC_setxattr_ctx(SMBCCTX *context,
                 else {
                         ret = 0;
                 }
-                
+
 		TALLOC_FREE(frame);
                 return ret;
         }
-        
+
         /*
          * Are they asking to set an access control element or to set
          * the entire access control list?
@@ -1844,12 +1835,12 @@ SMBC_setxattr_ctx(SMBCCTX *context,
             StrCaseCmp(name, "system.nt_sec_desc.revision") == 0 ||
             StrnCaseCmp(name, "system.nt_sec_desc.acl", 22) == 0 ||
             StrnCaseCmp(name, "system.nt_sec_desc.acl+", 23) == 0) {
-                
+
                 /* Yup. */
                 char *namevalue =
                         talloc_asprintf(talloc_tos(), "%s:%s",
                                         name+19, (const char *) value);
-                
+
                 if (! ipc_srv) {
                         ret = -1; /* errno set by SMBC_server() */
                 }
@@ -1868,18 +1859,18 @@ SMBC_setxattr_ctx(SMBCCTX *context,
 		TALLOC_FREE(frame);
                 return ret;
         }
-        
+
         /*
          * Are they asking to set the owner?
          */
         if (StrCaseCmp(name, "system.nt_sec_desc.owner") == 0 ||
             StrCaseCmp(name, "system.nt_sec_desc.owner+") == 0) {
-                
+
                 /* Yup. */
                 char *namevalue =
                         talloc_asprintf(talloc_tos(), "%s:%s",
                                         name+19, (const char *) value);
-                
+
                 if (! ipc_srv) {
                         ret = -1; /* errno set by SMBC_server() */
                 }
@@ -1894,18 +1885,18 @@ SMBC_setxattr_ctx(SMBCCTX *context,
 		TALLOC_FREE(frame);
                 return ret;
         }
-        
+
         /*
          * Are they asking to set the group?
          */
         if (StrCaseCmp(name, "system.nt_sec_desc.group") == 0 ||
             StrCaseCmp(name, "system.nt_sec_desc.group+") == 0) {
-                
+
                 /* Yup. */
                 char *namevalue =
                         talloc_asprintf(talloc_tos(), "%s:%s",
                                         name+19, (const char *) value);
-                
+
                 if (! ipc_srv) {
                         /* errno set by SMBC_server() */
                         ret = -1;
@@ -1921,7 +1912,7 @@ SMBC_setxattr_ctx(SMBCCTX *context,
 		TALLOC_FREE(frame);
                 return ret;
         }
-        
+
         /* Determine whether to use old-style or new-style attribute names */
         if (context->internal->full_time_names) {
                 /* new-style names */
@@ -1936,7 +1927,7 @@ SMBC_setxattr_ctx(SMBCCTX *context,
                 attr_strings.write_time_attr = "system.dos_attr.M_TIME";
                 attr_strings.change_time_attr = "system.dos_attr.C_TIME";
         }
-        
+
         /*
          * Are they asking to set a DOS attribute?
          */
@@ -1947,7 +1938,7 @@ SMBC_setxattr_ctx(SMBCCTX *context,
             StrCaseCmp(name, attr_strings.access_time_attr) == 0 ||
             StrCaseCmp(name, attr_strings.write_time_attr) == 0 ||
             StrCaseCmp(name, attr_strings.change_time_attr) == 0) {
-                
+
                 /* get a DOS Attribute Descriptor with current attributes */
                 dad = dos_attr_query(context, talloc_tos(), path, srv);
                 if (dad) {
@@ -1960,7 +1951,7 @@ SMBC_setxattr_ctx(SMBCCTX *context,
                         } else {
                                 /* Overwrite old with provided new params */
                                 dos_attr_parse(context, dad, srv, namevalue);
-                                
+
                                 /* Set the new DOS attributes */
                                 ret2 = SMBC_setatr(context, srv, path,
                                                    dad->create_time,
@@ -1968,7 +1959,7 @@ SMBC_setxattr_ctx(SMBCCTX *context,
                                                    dad->write_time,
                                                    dad->change_time,
                                                    dad->mode);
-                                
+
                                 /* ret2 has True (success) / False (failure) */
                                 if (ret2) {
                                         ret = 0;
@@ -1979,11 +1970,11 @@ SMBC_setxattr_ctx(SMBCCTX *context,
                 } else {
                         ret = -1;
                 }
-                
+
 		TALLOC_FREE(frame);
                 return ret;
         }
-        
+
         /* Unsupported attribute name */
         errno = EINVAL;
 	TALLOC_FREE(frame);
@@ -2013,22 +2004,21 @@ SMBC_getxattr_ctx(SMBCCTX *context,
                 const char * change_time_attr;
         } attr_strings;
 	TALLOC_CTX *frame = talloc_stackframe();
-        
+
 	if (!context || !context->internal->initialized) {
-                
                 errno = EINVAL;  /* Best I can think of ... */
 		TALLOC_FREE(frame);
                 return -1;
         }
-        
+
         if (!fname) {
                 errno = EINVAL;
 		TALLOC_FREE(frame);
                 return -1;
         }
-        
+
         DEBUG(4, ("smbc_getxattr(%s, %s)\n", fname, name));
-        
+
         if (SMBC_parse_path(frame,
                             context,
                             fname,
@@ -2043,7 +2033,7 @@ SMBC_getxattr_ctx(SMBCCTX *context,
 		TALLOC_FREE(frame);
 		return -1;
         }
-        
+
         if (!user || user[0] == (char)0) {
 		user = talloc_strdup(frame, smbc_getUser(context));
 		if (!user) {
@@ -2052,14 +2042,14 @@ SMBC_getxattr_ctx(SMBCCTX *context,
 			return -1;
 		}
 	}
-        
+
         srv = SMBC_server(frame, context, True,
                           server, share, &workgroup, &user, &password);
         if (!srv) {
 		TALLOC_FREE(frame);
                 return -1;  /* errno set by SMBC_server */
         }
-        
+
         if (! srv->no_nt_session) {
                 ipc_srv = SMBC_attr_server(frame, context, server, share,
                                            &workgroup, &user, &password);
@@ -2069,7 +2059,7 @@ SMBC_getxattr_ctx(SMBCCTX *context,
         } else {
                 ipc_srv = NULL;
         }
-        
+
         /* Determine whether to use old-style or new-style attribute names */
         if (context->internal->full_time_names) {
                 /* new-style names */
@@ -2084,7 +2074,7 @@ SMBC_getxattr_ctx(SMBCCTX *context,
                 attr_strings.write_time_attr = "system.dos_attr.M_TIME";
                 attr_strings.change_time_attr = "system.dos_attr.C_TIME";
         }
-        
+
         /* Are they requesting a supported attribute? */
         if (StrCaseCmp(name, "system.*") == 0 ||
             StrnCaseCmp(name, "system.*!", 9) == 0 ||
@@ -2111,7 +2101,7 @@ SMBC_getxattr_ctx(SMBCCTX *context,
             StrCaseCmp(name, attr_strings.write_time_attr) == 0 ||
             StrCaseCmp(name, attr_strings.change_time_attr) == 0 ||
             StrCaseCmp(name, "system.dos_attr.inode") == 0) {
-                
+
                 /* Yup. */
                 char *filename = (char *) name;
                 ret = cacl_get(context, talloc_tos(), srv,
@@ -2126,7 +2116,7 @@ SMBC_getxattr_ctx(SMBCCTX *context,
 		TALLOC_FREE(frame);
                 return ret;
         }
-        
+
         /* Unsupported attribute name */
         errno = EINVAL;
 	TALLOC_FREE(frame);
@@ -2149,22 +2139,21 @@ SMBC_removexattr_ctx(SMBCCTX *context,
 	char *workgroup = NULL;
 	char *path = NULL;
 	TALLOC_CTX *frame = talloc_stackframe();
-        
+
 	if (!context || !context->internal->initialized) {
-                
                 errno = EINVAL;  /* Best I can think of ... */
 		TALLOC_FREE(frame);
                 return -1;
         }
-        
+
         if (!fname) {
                 errno = EINVAL;
 		TALLOC_FREE(frame);
                 return -1;
         }
-        
+
         DEBUG(4, ("smbc_removexattr(%s, %s)\n", fname, name));
-        
+
 	if (SMBC_parse_path(frame,
                             context,
                             fname,
@@ -2179,7 +2168,7 @@ SMBC_removexattr_ctx(SMBCCTX *context,
 		TALLOC_FREE(frame);
 		return -1;
         }
-        
+
         if (!user || user[0] == (char)0) {
 		user = talloc_strdup(frame, smbc_getUser(context));
 		if (!user) {
@@ -2188,14 +2177,14 @@ SMBC_removexattr_ctx(SMBCCTX *context,
 			return -1;
 		}
 	}
-        
+
         srv = SMBC_server(frame, context, True,
                           server, share, &workgroup, &user, &password);
         if (!srv) {
 		TALLOC_FREE(frame);
                 return -1;  /* errno set by SMBC_server */
         }
-        
+
         if (! srv->no_nt_session) {
                 ipc_srv = SMBC_attr_server(frame, context, server, share,
                                            &workgroup, &user, &password);
@@ -2205,16 +2194,16 @@ SMBC_removexattr_ctx(SMBCCTX *context,
         } else {
                 ipc_srv = NULL;
         }
-        
+
         if (! ipc_srv) {
 		TALLOC_FREE(frame);
                 return -1; /* errno set by SMBC_attr_server */
         }
-        
+
         /* Are they asking to set the entire ACL? */
         if (StrCaseCmp(name, "system.nt_sec_desc.*") == 0 ||
             StrCaseCmp(name, "system.nt_sec_desc.*+") == 0) {
-                
+
                 /* Yup. */
                 ret = cacl_set(context, talloc_tos(), srv->cli,
                                ipc_srv->cli, &ipc_srv->pol, path,
@@ -2222,7 +2211,7 @@ SMBC_removexattr_ctx(SMBCCTX *context,
 		TALLOC_FREE(frame);
                 return ret;
         }
-        
+
         /*
          * Are they asking to remove one or more spceific security descriptor
          * attributes?
@@ -2234,7 +2223,7 @@ SMBC_removexattr_ctx(SMBCCTX *context,
             StrCaseCmp(name, "system.nt_sec_desc.group+") == 0 ||
             StrnCaseCmp(name, "system.nt_sec_desc.acl", 22) == 0 ||
             StrnCaseCmp(name, "system.nt_sec_desc.acl+", 23) == 0) {
-                
+
                 /* Yup. */
                 ret = cacl_set(context, talloc_tos(), srv->cli,
                                ipc_srv->cli, &ipc_srv->pol, path,
@@ -2243,7 +2232,7 @@ SMBC_removexattr_ctx(SMBCCTX *context,
 		TALLOC_FREE(frame);
                 return ret;
         }
-        
+
         /* Unsupported attribute name */
         errno = EINVAL;
 	TALLOC_FREE(frame);
@@ -2302,7 +2291,7 @@ SMBC_listxattr_ctx(SMBCCTX *context,
                 "system.dos_attr.change_time\0"
                 ;
         const char * supported;
-        
+
         if (context->internal->full_time_names) {
                 supported = supported_new;
                 retsize = sizeof(supported_new);
@@ -2310,16 +2299,16 @@ SMBC_listxattr_ctx(SMBCCTX *context,
                 supported = supported_old;
                 retsize = sizeof(supported_old);
         }
-        
+
         if (size == 0) {
                 return retsize;
         }
-        
+
         if (retsize > size) {
                 errno = ERANGE;
                 return -1;
         }
-        
+
         /* this can't be strcpy() because there are embedded null characters */
         memcpy(list, supported, retsize);
         return retsize;