Additional revamped libsmbclient documentation

- Ensured that all public functions have documentation in libsmbclient.h
- Reformatted for "proper" indentation
- Re-added temporarily-disabled alternate authentication function capability

Derrell
(cherry picked from commit 64b7150d92849a1e1e2416b9dcc12fae8d6bea99)
(This used to be commit dca8a612e94095e38df50f0fe567c75ceb8124fe)

13 files changed, 2579 insertions, 2152 deletions

diff --git a/source3/include/libsmb_internal.h b/source3/include/libsmb_internal.h
index 555b6ac138..e687e24268 100644
--- a/source3/include/libsmb_internal.h
+++ b/source3/include/libsmb_internal.h
@@ -111,23 +111,23 @@ struct _SMBCFILE {
 struct SMBC_internal_data {
 
 	/* True when this handle is initialized */
-	bool            initialized;
+	bool                                    initialized;
 
 #if 0 /* Left in libsmbclient.h for backward compatibility */
         /* Netbios name used for making connections */
-        char *          netbios_name;
+        char *                                  netbios_name;
 
         /* Workgroup used for making connections */
-        char *          workgroup;
+        char *                                  workgroup;
 
         /* Username used for making connections */
-        char *          user;
+        char *                                  user;
 
         /* Debug level */
-        int             debug;
+        int                                     debug;
 
         /* Connection timeout value */
-        int             timeout;
+        int                                     timeout;
 #endif
 
         /* dirent pointer location
@@ -141,22 +141,22 @@ struct SMBC_internal_data {
          * According to <linux/limits.h>, NAME_MAX is 255.  Is it longer
          * anyplace else?
          */
-	char            dirent[1024];
+	char                                    dirent[1024];
 
 	/*
          * server connection list
 	 */
-	SMBCSRV *       servers;
+	SMBCSRV *                               servers;
 	
 	/*
          * open file/dir list
 	 */
-	SMBCFILE *      files;
+	SMBCFILE *                              files;
 
         /*
          * Log to standard error instead of the more typical standard output
          */
-        bool            debug_stderr;
+        bool                                    debug_stderr;
 
         /*
          * Support "Create Time" in get/set with the *xattr() functions, if
@@ -165,27 +165,34 @@ struct SMBC_internal_data {
          * CREATE_TIME.  Default is FALSE, i.e.  to use the old-style shorter
          * names and to not support CREATE time, for backward compatibility.
          */
-        bool            full_time_names;
+        bool                                    full_time_names;
 
         /*
          * The share mode of a file being opened.  To match POSIX semantics
          * (and maintain backward compatibility), DENY_NONE is the default.
          */
-        smbc_share_mode share_mode;
+        smbc_share_mode                         share_mode;
+
+        /*
+         * Authentication function which includes the context.  This will be
+         * used if set; otherwise context->callbacks.auth_fn() will be used.
+         */
+        smbc_get_auth_data_with_context_fn      auth_fn_with_context;
 
         /*
          * An opaque (to this library) user data handle which can be set
          * and retrieved with smbc_option_set() and smbc_option_get().
          */
-        void *          user_data;
+        void *                                  user_data;
 
         /*
          * Should we attempt UNIX smb encryption ? 
          * Set to 0 if we should never attempt, set to 1 if
          * encryption requested, set to 2 if encryption required.
          */
-        int             smb_encryption_level;
+        smbc_smb_encrypt_level                  smb_encryption_level;
 
+#if 0 /* Left in libsmbclient.h for backward compatibility */
         /*
          * From how many local master browsers should the list of
          * workgroups be retrieved?  It can take up to 12 minutes or
@@ -203,7 +210,7 @@ struct SMBC_internal_data {
          * networks with many workgroups, a suitable value for this
          * variable is probably somewhere around 3. (Default: 3).
          */
-        int             browse_max_lmb_count;
+        int                                     browse_max_lmb_count;
 
         /*
          * There is a difference in the desired return strings from
@@ -228,7 +235,7 @@ struct SMBC_internal_data {
          *
          * For backwards compatibility, this option defaults to False.
          */
-        bool            urlencode_readdir_entries;
+        bool                                    urlencode_readdir_entries;
 
         /*
          * Some Windows versions appear to have a limit to the number
@@ -240,15 +247,14 @@ struct SMBC_internal_data {
          * avoided by using only a single connection to each server,
          * and issuing a new TREE CONNECT when the share is accessed.
          */
-        bool            one_share_per_server;
+        bool                                    one_share_per_server;
 
-#if 0 /* Left in libsmbclient.h (flags) for backward compatibility */
         /* Kerberos-related flags */
-        bool            use_kerberos;
-        bool            fallback_after_kerberos;
+        bool                                    use_kerberos;
+        bool                                    fallback_after_kerberos;
 
         /* Don't try to do automatic anonymous login */
-        bool            no_auto_anonymous_login;
+        bool                                    no_auto_anonymous_login;
 
         /* Server-related functions */
         struct
diff --git a/source3/include/libsmbclient.h b/source3/include/libsmbclient.h
index 4d78bb2568..28cad351de 100644
--- a/source3/include/libsmbclient.h
+++ b/source3/include/libsmbclient.h
@@ -155,6 +155,21 @@ typedef enum smbc_share_mode
 } smbc_share_mode;
 
 
+/**
+ * Values for option SMB Encryption Level, as set and retrieved with
+ * smbc_setOptionSmbEncryptionLevel() and smbc_getOptionSmbEncryptionLevel()
+ */
+typedef enum smbc_smb_encrypt_level
+{
+    SMBC_ENCRYPTLEVEL_NONE      = 0,
+    SMBC_ENCRYPTLEVEL_REQUEST   = 1,
+    SMBC_ENCRYPTLEVEL_REQUIRE   = 2
+} smbc_smb_encrypt_level;
+
+
+typedef int smbc_bool;
+
+
 #ifndef ENOATTR
 # define ENOATTR ENOENT        /* No such attribute */
 #endif
@@ -214,11 +229,17 @@ typedef struct _SMBCCTX SMBCCTX;
 
 
 /*
+ * Flags for SMBCCTX->flags
+ *
  * NEW CODE SHOULD NOT DIRECTLY MANIPULATE THE CONTEXT STRUCTURE.
- * For these options, use smbc_option_set() and smbc_option_get().
+ * Instead, use:
+ *   smbc_setOptionUseKerberos()
+ *   smbc_getOptionUseKerberos()
+ *   smbc_setOptionFallbackAfterKerberos()
+ *   smbc_getOptionFallbackAFterKerberos()
+ *   smbc_setOptionNoAutoAnonymousLogin()
+ *   smbc_getOptionNoAutoAnonymousLogin()
  */
-
-/* Flags for SMBCCTX->flags */
 # define SMB_CTX_FLAG_USE_KERBEROS (1 << 0)
 # define SMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS (1 << 1)
 # define SMBCCTX_FLAG_NO_AUTO_ANONYMOUS_LOGON (1 << 2)
@@ -398,48 +419,286 @@ typedef int (*smbc_remove_cached_srv_fn)(SMBCCTX * c, SMBCSRV *srv);
 typedef int (*smbc_purge_cached_srv_fn)     (SMBCCTX * c);
 
 
+
+/*****************************************
+ * Getters and setters for CONFIGURATION *
+ *****************************************/
+
 /** Get the debug level */
-int smbc_getDebug(SMBCCTX *c);
+int
+smbc_getDebug(SMBCCTX *c);
 
 /** Set the debug level */
-void smbc_setDebug(SMBCCTX *c, int debug);
+void
+smbc_setDebug(SMBCCTX *c, int debug);
 
 /** Get the netbios name used for making connections */
-char * smbc_getNetbiosName(SMBCCTX *c);
+char *
+smbc_getNetbiosName(SMBCCTX *c);
 
 /** Set the netbios name used for making connections */
-void smbc_setNetbiosName(SMBCCTX *c, char * netbios_name);
+void
+smbc_setNetbiosName(SMBCCTX *c, char * netbios_name);
 
 /** Get the workgroup used for making connections */
-char * smbc_getWorkgroup(SMBCCTX *c);
+char *
+smbc_getWorkgroup(SMBCCTX *c);
 
 /** Set the workgroup used for making connections */
 void smbc_setWorkgroup(SMBCCTX *c, char * workgroup);
 
 /** Get the username used for making connections */
-char * smbc_getUser(SMBCCTX *c);
+char *
+smbc_getUser(SMBCCTX *c);
 
 /** Set the username used for making connections */
-void smbc_setUser(SMBCCTX *c, char * user);
+void
+smbc_setUser(SMBCCTX *c, char * user);
 
 /**
  * Get the timeout used for waiting on connections and response data
  * (in milliseconds)
  */
-int smbc_getTimeout(SMBCCTX *c);
+int
+smbc_getTimeout(SMBCCTX *c);
 
 /**
  * Set the timeout used for waiting on connections and response data
  * (in milliseconds)
  */
-void smbc_setTimeout(SMBCCTX *c, int timeout);
+void
+smbc_setTimeout(SMBCCTX *c, int timeout);
+
+
+
+/***********************************
+ * Getters and setters for OPTIONS *
+ ***********************************/
+
+/** Get whether to log to standard error instead of standard output */
+smbc_bool
+smbc_getOptionDebugToStderr(SMBCCTX *c);
+
+/** Set whether to log to standard error instead of standard output */
+void
+smbc_setOptionDebugToStderr(SMBCCTX *c, smbc_bool b);
+
+/**
+ * Get whether to use new-style time attribute names, e.g. WRITE_TIME rather
+ * than the old-style names such as M_TIME.  This allows also setting/getting
+ * CREATE_TIME which was previously unimplemented.  (Note that the old C_TIME
+ * was supposed to be CHANGE_TIME but was confused and sometimes referred to
+ * CREATE_TIME.)
+ */
+smbc_bool
+smbc_getOptionFullTimeNames(SMBCCTX *c);
+
+/**
+ * Set whether to use new-style time attribute names, e.g. WRITE_TIME rather
+ * than the old-style names such as M_TIME.  This allows also setting/getting
+ * CREATE_TIME which was previously unimplemented.  (Note that the old C_TIME
+ * was supposed to be CHANGE_TIME but was confused and sometimes referred to
+ * CREATE_TIME.)
+ */
+void
+smbc_setOptionFullTimeNames(SMBCCTX *c, smbc_bool b);
+
+/**
+ * Get the share mode to use for files opened with SMBC_open_ctx().  The
+ * default is SMBC_SHAREMODE_DENY_NONE.
+ */
+smbc_share_mode
+smbc_getOptionOpenShareMode(SMBCCTX *c);
+
+/**
+ * Set the share mode to use for files opened with SMBC_open_ctx().  The
+ * default is SMBC_SHAREMODE_DENY_NONE.
+ */
+void
+smbc_setOptionOpenShareMode(SMBCCTX *c, smbc_share_mode share_mode);
+
+/** Retrieve a previously saved user data handle */
+void *
+smbc_getOptionUserData(SMBCCTX *c);
+
+/** Save a user data handle */
+void
+smbc_setOptionUserData(SMBCCTX *c, void *user_data);
+
+/** Get the encoded value for encryption level. */
+smbc_smb_encrypt_level
+smbc_getOptionSmbEncryptionLevel(SMBCCTX *c);
+
+/** Set the encoded value for encryption level. */
+void
+smbc_setOptionSmbEncryptionLevel(SMBCCTX *c, smbc_smb_encrypt_level level);
+
+/**
+ * Get from how many local master browsers should the list of workgroups be
+ * retrieved.  It can take up to 12 minutes or longer after a server becomes a
+ * local master browser, for it to have the entire browse list (the list of
+ * workgroups/domains) from an entire network.  Since a client never knows
+ * which local master browser will be found first, the one which is found
+ * first and used to retrieve a browse list may have an incomplete or empty
+ * browse list.  By requesting the browse list from multiple local master
+ * browsers, a more complete list can be generated.  For small networks (few
+ * workgroups), it is recommended that this value be set to 0, causing the
+ * browse lists from all found local master browsers to be retrieved and
+ * merged.  For networks with many workgroups, a suitable value for this
+ * variable is probably somewhere around 3. (Default: 3).
+ */
+int
+smbc_getOptionBrowseMaxLmbCount(SMBCCTX *c);
+
+/**
+ * Set from how many local master browsers should the list of workgroups be
+ * retrieved.  It can take up to 12 minutes or longer after a server becomes a
+ * local master browser, for it to have the entire browse list (the list of
+ * workgroups/domains) from an entire network.  Since a client never knows
+ * which local master browser will be found first, the one which is found
+ * first and used to retrieve a browse list may have an incomplete or empty
+ * browse list.  By requesting the browse list from multiple local master
+ * browsers, a more complete list can be generated.  For small networks (few
+ * workgroups), it is recommended that this value be set to 0, causing the
+ * browse lists from all found local master browsers to be retrieved and
+ * merged.  For networks with many workgroups, a suitable value for this
+ * variable is probably somewhere around 3. (Default: 3).
+ */
+void
+smbc_setOptionBrowseMaxLmbCount(SMBCCTX *c, int count);
+
+/**
+ * Get whether to url-encode readdir entries.
+ *
+ * There is a difference in the desired return strings from
+ * smbc_readdir() depending upon whether the filenames are to
+ * be displayed to the user, or whether they are to be
+ * appended to the path name passed to smbc_opendir() to call
+ * a further smbc_ function (e.g. open the file with
+ * smbc_open()).  In the former case, the filename should be
+ * in "human readable" form.  In the latter case, the smbc_
+ * functions expect a URL which must be url-encoded.  Those
+ * functions decode the URL.  If, for example, smbc_readdir()
+ * returned a file name of "abc%20def.txt", passing a path
+ * with this file name attached to smbc_open() would cause
+ * smbc_open to attempt to open the file "abc def.txt" since
+ * the %20 is decoded into a space.
+ *
+ * Set this option to True if the names returned by
+ * smbc_readdir() should be url-encoded such that they can be
+ * passed back to another smbc_ call.  Set it to False if the
+ * names returned by smbc_readdir() are to be presented to the
+ * user.
+ *
+ * For backwards compatibility, this option defaults to False.
+ */
+smbc_bool
+smbc_getOptionUrlEncodeReaddirEntries(SMBCCTX *c);
+
+/**
+ * Set whether to url-encode readdir entries.
+ *
+ * There is a difference in the desired return strings from
+ * smbc_readdir() depending upon whether the filenames are to
+ * be displayed to the user, or whether they are to be
+ * appended to the path name passed to smbc_opendir() to call
+ * a further smbc_ function (e.g. open the file with
+ * smbc_open()).  In the former case, the filename should be
+ * in "human readable" form.  In the latter case, the smbc_
+ * functions expect a URL which must be url-encoded.  Those
+ * functions decode the URL.  If, for example, smbc_readdir()
+ * returned a file name of "abc%20def.txt", passing a path
+ * with this file name attached to smbc_open() would cause
+ * smbc_open to attempt to open the file "abc def.txt" since
+ * the %20 is decoded into a space.
+ *
+ * Set this option to True if the names returned by
+ * smbc_readdir() should be url-encoded such that they can be
+ * passed back to another smbc_ call.  Set it to False if the
+ * names returned by smbc_readdir() are to be presented to the
+ * user.
+ *
+ * For backwards compatibility, this option defaults to False.
+ */
+void
+smbc_setOptionUrlEncodeReaddirEntries(SMBCCTX *c, smbc_bool b);
+
+/**
+ * Get whether to use the same connection for all shares on a server.
+ *
+ * Some Windows versions appear to have a limit to the number
+ * of concurrent SESSIONs and/or TREE CONNECTions.  In
+ * one-shot programs (i.e. the program runs and then quickly
+ * ends, thereby shutting down all connections), it is
+ * probably reasonable to establish a new connection for each
+ * share.  In long-running applications, the limitation can be
+ * avoided by using only a single connection to each server,
+ * and issuing a new TREE CONNECT when the share is accessed.
+ */
+smbc_bool
+smbc_getOptionOneSharePerServer(SMBCCTX *c);
+
+/**
+ * Set whether to use the same connection for all shares on a server.
+ *
+ * Some Windows versions appear to have a limit to the number
+ * of concurrent SESSIONs and/or TREE CONNECTions.  In
+ * one-shot programs (i.e. the program runs and then quickly
+ * ends, thereby shutting down all connections), it is
+ * probably reasonable to establish a new connection for each
+ * share.  In long-running applications, the limitation can be
+ * avoided by using only a single connection to each server,
+ * and issuing a new TREE CONNECT when the share is accessed.
+ */
+void
+smbc_setOptionOneSharePerServer(SMBCCTX *c, smbc_bool b);
+
+/** Get whether to enable use of kerberos */
+smbc_bool
+smbc_getOptionUseKerberos(SMBCCTX *c);
+
+/** Set whether to enable use of kerberos */
+void
+smbc_setOptionUseKerberos(SMBCCTX *c, smbc_bool b);
+
+/** Get whether to fallback after kerberos */
+smbc_bool
+smbc_getOptionFallbackAfterKerberos(SMBCCTX *c);
+
+/** Set whether to fallback after kerberos */
+void
+smbc_setOptionFallbackAfterKerberos(SMBCCTX *c, smbc_bool b);
+
+/** Get whether to automatically select anonymous login */
+smbc_bool
+smbc_getOptionNoAutoAnonymousLogin(SMBCCTX *c);
+
+/** Set whether to automatically select anonymous login */
+void
+smbc_setOptionNoAutoAnonymousLogin(SMBCCTX *c, smbc_bool b);
 
 /** Get the function for obtaining authentication data */
 smbc_get_auth_data_fn smbc_getFunctionAuthData(SMBCCTX *c);
 
+
+
+
+/*************************************
+ * Getters and setters for FUNCTIONS *
+ *************************************/
+
 /** Set the function for obtaining authentication data */
 void smbc_setFunctionAuthData(SMBCCTX *c, smbc_get_auth_data_fn f);
 
+/** Get the new-style authentication function which includes the context. */
+smbc_get_auth_data_with_context_fn
+smbc_getFunctionAuthDataWithContext(SMBCCTX *c);
+
+/** Set the new-style authentication function which includes the context. */
+void
+smbc_setFunctionAuthDataWithContext(SMBCCTX *c,
+                                  smbc_get_auth_data_with_context_fn fn);
+
 /** Get the function for checking if a server is still good */
 smbc_check_server_fn smbc_getFunctionCheckServer(SMBCCTX *c);
 
@@ -492,9 +751,12 @@ struct smbc_server_cache * smbc_getServerCacheData(SMBCCTX *c);
 void smbc_setServerCacheData(SMBCCTX *c, struct smbc_server_cache * cache);
 
 
-/**
- * Callable functions for files.
- */
+
+/*****************************************************************
+ * Callable functions for files.                                 *
+ * Each callable has a function signature typedef, a declaration *
+ * for the getter, and a declaration for the setter.             *
+ *****************************************************************/
 
 typedef SMBCFILE * (*smbc_open_fn)(SMBCCTX *c,
                                    const char *fname,
@@ -566,9 +828,12 @@ smbc_close_fn smbc_getFunctionClose(SMBCCTX *c);
 void smbc_setFunctionClose(SMBCCTX *c, smbc_close_fn f);
 
 
-/**
- * Callable functions for directories.
- */
+
+/*****************************************************************
+ * Callable functions for directories.                           *
+ * Each callable has a function signature typedef, a declaration *
+ * for the getter, and a declaration for the setter.             *
+ *****************************************************************/
 
 typedef SMBCFILE * (*smbc_opendir_fn)(SMBCCTX *c,
                                       const char *fname);
@@ -621,9 +886,12 @@ smbc_fstatdir_fn smbc_getFunctionFstatdir(SMBCCTX *c);
 void smbc_setFunctionFstatdir(SMBCCTX *c, smbc_fstatdir_fn f);
 
 
-/**
- * Callable functions applicable to both files and directories.
- */
+
+/*****************************************************************
+ * Callable functions applicable to both files and directories.  *
+ * Each callable has a function signature typedef, a declaration *
+ * for the getter, and a declaration for the setter.             *
+ *****************************************************************/
 
 typedef int (*smbc_chmod_fn)(SMBCCTX *c,
                              const char *fname,
@@ -668,9 +936,12 @@ smbc_listxattr_fn smbc_getFunctionListxattr(SMBCCTX *c);
 void smbc_setFunctionListxattr(SMBCCTX *c, smbc_listxattr_fn f);
 
 
-/**
- * Callable functions related to printing
- */
+
+/*****************************************************************
+ * Callable functions for printing.                              *
+ * Each callable has a function signature typedef, a declaration *
+ * for the getter, and a declaration for the setter.             *
+ *****************************************************************/
 
 typedef int (*smbc_print_file_fn)(SMBCCTX *c_file,
                                   const char *fname,
@@ -2341,6 +2612,7 @@ struct _SMBCCTX {
                 /**
                  * debug level
                  *
+                 * Manually setting/retrieving this value is deprecated.
                  * Use smbc_getDebug() and smbc_setDebug()
                  */
                 int     debug;
@@ -2348,6 +2620,7 @@ struct _SMBCCTX {
                 /**
                  * netbios name used for making connections
                  *
+                 * Manually setting/retrieving this value is deprecated.
                  * Use smbc_getNetbiosName() and smbc_setNetbiosName()
                  */
                 char * netbios_name;
@@ -2355,6 +2628,7 @@ struct _SMBCCTX {
                 /**
                  * workgroup name used for making connections
                  *
+                 * Manually setting/retrieving this value is deprecated.
                  * Use smbc_getWorkgroup() and smbc_setWorkgroup()
                  */
                 char * workgroup;
@@ -2362,6 +2636,7 @@ struct _SMBCCTX {
                 /**
                  * username used for making connections
                  *
+                 * Manually setting/retrieving this value is deprecated.
                  * Use smbc_getUser() and smbc_setUser()
                  */
                 char * user;
@@ -2370,6 +2645,7 @@ struct _SMBCCTX {
                  * timeout used for waiting on connections / response data (in
                  * milliseconds)
                  *
+                 * Manually setting/retrieving this value is deprecated.
                  * Use smbc_getTimeout() and smbc_setTimeout()
                  */
                 int timeout;
@@ -2379,6 +2655,8 @@ struct _SMBCCTX {
          * callable functions for files:
 	 * For usage and return values see the SMBC_* functions
          *
+         * Manually setting/retrieving these values is deprecated.
+         *
          * Use smbc_getFunction*() and smbc_setFunction*(), e.g.
          * smbc_getFunctionOpen(), smbc_setFunctionUnlink(), etc.
 	 */ 
@@ -2433,6 +2711,7 @@ struct _SMBCCTX {
 		/**
                  * authentication function callback: called upon auth requests
                  *
+                 * Manually setting/retrieving this value is deprecated.
                  * Use smbc_getFunctionAuthData(), smbc_setFunctionAuthData()
 		 */
                 smbc_get_auth_data_fn get_auth_data_fn;
@@ -2440,6 +2719,7 @@ struct _SMBCCTX {
 		/**
                  * check if a server is still good
                  *
+                 * Manually setting/retrieving this value is deprecated.
                  * Use smbc_getFunctionCheckServer(),
                  * smbc_setFunctionCheckServer()
 		 */
@@ -2448,6 +2728,7 @@ struct _SMBCCTX {
 		/**
                  * remove a server if unused
                  *
+                 * Manually setting/retrieving this value is deprecated.
                  * Use smbc_getFunctionRemoveUnusedServer(),
                  * smbc_setFunctionCheckServer()
 		 */
@@ -2467,6 +2748,7 @@ struct _SMBCCTX {
 		/**
                  * server cache addition 
                  *
+                 * Manually setting/retrieving this value is deprecated.
                  * Use smbc_getFunctionAddCachedServer(),
                  * smbc_setFunctionAddCachedServer()
 		 */
@@ -2475,6 +2757,7 @@ struct _SMBCCTX {
 		/**
                  * server cache lookup 
                  *
+                 * Manually setting/retrieving this value is deprecated.
                  * Use smbc_getFunctionGetCachedServer(),
                  * smbc_setFunctionGetCachedServer()
 		 */
@@ -2483,6 +2766,7 @@ struct _SMBCCTX {
 		/**
                  * server cache removal
                  *
+                 * Manually setting/retrieving this value is deprecated.
                  * Use smbc_getFunctionRemoveCachedServer(),
                  * smbc_setFunctionRemoveCachedServer()
 		 */
@@ -2492,6 +2776,7 @@ struct _SMBCCTX {
                  * server cache purging, try to remove all cached servers
                  * (disconnect)
                  *
+                 * Manually setting/retrieving this value is deprecated.
                  * Use smbc_getFunctionPurgeCachedServers(),
                  * smbc_setFunctionPurgeCachedServers()
 		 */
@@ -2500,6 +2785,7 @@ struct _SMBCCTX {
                 /**
                  * Space to store private data of the server cache.
                  *
+                 * Manually setting/retrieving this value is deprecated.
                  * Use smbc_getServerCacheData(), smbc_setServerCacheData()
                  */
                 struct smbc_server_cache * server_cache_data;
@@ -2508,7 +2794,14 @@ struct _SMBCCTX {
         /*
          * Very old configuration options.
          * 
-         * Use smbc_option_set() and smbc_option_get() instead.
+         * Manually setting/retrieving this value is deprecated.
+         * Use one of the following functions instead:
+         *   smbc_setOptionUseKerberos()
+         *   smbc_getOptionUseKerberos()
+         *   smbc_setOptionFallbackAfterKerberos()
+         *   smbc_getOptionFallbackAfterKerberos()
+         *   smbc_setOptionNoAutoAnonymousLogin()
+         *   smbc_getOptionNoAutoAnonymousLogin()
          */
         struct
         {
@@ -2521,66 +2814,12 @@ struct _SMBCCTX {
          *
          *  NEW OPTIONS ARE NOT ADDED HERE!
          *
-         *  We must maintain ABI backward compatibility.  We now use
-         *  smbc_option_set() and smbc_option_get() for all newly added
-         *  options.
+         *  To set and retrieve options, use the smbc_setOption*() and
+         *  smbc_getOption*() functions.
          */
         struct _smbc_options {
-
-                /*
-                 * From how many local master browsers should the list of
-                 * workgroups be retrieved?  It can take up to 12 minutes or
-                 * longer after a server becomes a local master browser, for
-                 * it to have the entire browse list (the list of
-                 * workgroups/domains) from an entire network.  Since a client
-                 * never knows which local master browser will be found first,
-                 * the one which is found first and used to retrieve a browse
-                 * list may have an incomplete or empty browse list.  By
-                 * requesting the browse list from multiple local master
-                 * browsers, a more complete list can be generated.  For small
-                 * networks (few workgroups), it is recommended that this
-                 * value be set to 0, causing the browse lists from all found
-                 * local master browsers to be retrieved and merged.  For
-                 * networks with many workgroups, a suitable value for this
-                 * variable is probably somewhere around 3. (Default: 3).
-                 */
                 int browse_max_lmb_count;
-
-                /*
-                 * There is a difference in the desired return strings from
-                 * smbc_readdir() depending upon whether the filenames are to
-                 * be displayed to the user, or whether they are to be
-                 * appended to the path name passed to smbc_opendir() to call
-                 * a further smbc_ function (e.g. open the file with
-                 * smbc_open()).  In the former case, the filename should be
-                 * in "human readable" form.  In the latter case, the smbc_
-                 * functions expect a URL which must be url-encoded.  Those
-                 * functions decode the URL.  If, for example, smbc_readdir()
-                 * returned a file name of "abc%20def.txt", passing a path
-                 * with this file name attached to smbc_open() would cause
-                 * smbc_open to attempt to open the file "abc def.txt" since
-                 * the %20 is decoded into a space.
-                 *
-                 * Set this option to True if the names returned by
-                 * smbc_readdir() should be url-encoded such that they can be
-                 * passed back to another smbc_ call.  Set it to False if the
-                 * names returned by smbc_readdir() are to be presented to the
-                 * user.
-                 *
-                 * For backwards compatibility, this option defaults to False.
-                 */
                 int urlencode_readdir_entries;
-
-                /*
-                 * Some Windows versions appear to have a limit to the number
-                 * of concurrent SESSIONs and/or TREE CONNECTions.  In
-                 * one-shot programs (i.e. the program runs and then quickly
-                 * ends, thereby shutting down all connections), it is
-                 * probably reasonable to establish a new connection for each
-                 * share.  In long-running applications, the limitation can be
-                 * avoided by using only a single connection to each server,
-                 * and issuing a new TREE CONNECT when the share is accessed.
-                 */
                 int one_share_per_server;
         } options;
 	
diff --git a/source3/libsmb/libsmb_cache.c b/source3/libsmb/libsmb_cache.c
index 7ff92f1b4e..ff13fd7eac 100644
--- a/source3/libsmb/libsmb_cache.c
+++ b/source3/libsmb/libsmb_cache.c
@@ -35,10 +35,10 @@ struct smbc_server_cache {
 	char *workgroup;
 	char *username;
 	SMBCSRV *server;
-	
+        
 	struct smbc_server_cache *next, *prev;
 };
-	
+
 
 
 /*
@@ -54,51 +54,51 @@ SMBC_add_cached_server(SMBCCTX * context,
                        const char * username)
 {
 	struct smbc_server_cache * srvcache = NULL;
-
+        
 	if (!(srvcache = SMB_MALLOC_P(struct smbc_server_cache))) {
 		errno = ENOMEM;
 		DEBUG(3, ("Not enough space for server cache allocation\n"));
 		return 1;
 	}
-       
+        
 	ZERO_STRUCTP(srvcache);
-
+        
 	srvcache->server = newsrv;
-
+        
 	srvcache->server_name = SMB_STRDUP(server);
 	if (!srvcache->server_name) {
 		errno = ENOMEM;
 		goto failed;
 	}
-
+        
 	srvcache->share_name = SMB_STRDUP(share);
 	if (!srvcache->share_name) {
 		errno = ENOMEM;
 		goto failed;
 	}
-
+        
 	srvcache->workgroup = SMB_STRDUP(workgroup);
 	if (!srvcache->workgroup) {
 		errno = ENOMEM;
 		goto failed;
 	}
-
+        
 	srvcache->username = SMB_STRDUP(username);
 	if (!srvcache->username) {
 		errno = ENOMEM;
 		goto failed;
 	}
-
+        
 	DLIST_ADD((context->cache.server_cache_data), srvcache);
 	return 0;
-
- failed:
+        
+failed:
 	SAFE_FREE(srvcache->server_name);
 	SAFE_FREE(srvcache->share_name);
 	SAFE_FREE(srvcache->workgroup);
 	SAFE_FREE(srvcache->username);
 	SAFE_FREE(srvcache);
-	
+        
 	return 1;
 }
 
@@ -117,19 +117,19 @@ SMBC_get_cached_server(SMBCCTX * context,
                        const char * user)
 {
 	struct smbc_server_cache * srv = NULL;
-	
+        
 	/* Search the cache lines */
 	for (srv = context->cache.server_cache_data; srv; srv = srv->next) {
-
+                
 		if (strcmp(server,srv->server_name)  == 0 &&
 		    strcmp(workgroup,srv->workgroup) == 0 &&
 		    strcmp(user, srv->username)  == 0) {
-
+                        
                         /* If the share name matches, we're cool */
                         if (strcmp(share, srv->share_name) == 0) {
                                 return srv->server;
                         }
-
+                        
                         /*
                          * We only return an empty share name or the attribute
                          * server on an exact match (which would have been
@@ -137,7 +137,7 @@ SMBC_get_cached_server(SMBCCTX * context,
                          */
                         if (*share == '\0' || strcmp(share, "*IPC$") == 0)
                                 continue;
-
+                        
                         /*
                          * Never return an empty share name or the attribute
                          * server if it wasn't what was requested.
@@ -145,7 +145,7 @@ SMBC_get_cached_server(SMBCCTX * context,
                         if (*srv->share_name == '\0' ||
                             strcmp(srv->share_name, "*IPC$") == 0)
                                 continue;
-
+                        
                         /*
                          * If we're only allowing one share per server, then
                          * a connection to the server (other than the
@@ -164,7 +164,7 @@ SMBC_get_cached_server(SMBCCTX * context,
                                         context->cache.remove_cached_server_fn(context, srv->server);
                                         continue;
                                 }
-
+                                
                                 /*
                                  * Save the new share name.  We've
                                  * disconnected from the old share, and are
@@ -179,13 +179,13 @@ SMBC_get_cached_server(SMBCCTX * context,
                                         context->cache.remove_cached_server_fn(context, srv->server);
                                         continue;
                                 }
-
-
+                                
+                                
                                 return srv->server;
                         }
                 }
 	}
-
+        
 	return NULL;
 }
 
@@ -200,10 +200,10 @@ SMBC_remove_cached_server(SMBCCTX * context,
                           SMBCSRV * server)
 {
 	struct smbc_server_cache * srv = NULL;
-	
+        
 	for (srv = context->cache.server_cache_data; srv; srv = srv->next) {
 		if (server == srv->server) { 
-
+                        
 			/* remove this sucker */
 			DLIST_REMOVE(context->cache.server_cache_data, srv);
 			SAFE_FREE(srv->server_name);
@@ -229,13 +229,13 @@ SMBC_purge_cached_servers(SMBCCTX * context)
 	struct smbc_server_cache * srv;
 	struct smbc_server_cache * next;
 	int could_not_purge_all = 0;
-
+        
 	for (srv = context->cache.server_cache_data,
                      next = (srv ? srv->next :NULL);
              srv;
              srv = next,
                      next = (srv ? srv->next : NULL)) {
-
+                
 		if (SMBC_remove_unused_server(context, srv->server)) {
 			/* could not be removed */
 			could_not_purge_all = 1;
diff --git a/source3/libsmb/libsmb_compat.c b/source3/libsmb/libsmb_compat.c
index 7a0536a92d..9ef5e51fa9 100644
--- a/source3/libsmb/libsmb_compat.c
+++ b/source3/libsmb/libsmb_compat.c
@@ -55,11 +55,11 @@ static int
 add_fd(SMBCFILE * file)
 {
         struct smbc_compat_fdlist * f = smbc_compat_fd_avail;
-
+        
 	if (f) {
                 /* We found one that's available */
                 DLIST_REMOVE(smbc_compat_fd_avail, f);
-
+                
 	} else {
                 /*
                  * None were available, so allocate one.  Keep the number of
@@ -72,19 +72,19 @@ add_fd(SMBCFILE * file)
                         errno = EMFILE;
                         return -1;
                 }
-
+                
                 f = SMB_MALLOC_P(struct smbc_compat_fdlist);
                 if (!f) {
                         errno = ENOMEM;
                         return -1;
                 }
-	
+                
                 f->fd = SMBC_BASE_FD + smbc_compat_nextfd++;
         }
-
+        
 	f->file = file;
 	DLIST_ADD(smbc_compat_fd_in_use, f);
-
+        
 	return f->fd;
 }
 
@@ -95,13 +95,13 @@ static int
 del_fd(int fd)
 {
 	struct smbc_compat_fdlist * f = smbc_compat_fd_in_use;
-
+        
 	while (f) {
 		if (f->fd == fd) 
 			break;
 		f = f->next;
 	}
-
+        
 	if (f) {
 		/* found */
 		DLIST_REMOVE(smbc_compat_fd_in_use, f);
@@ -111,7 +111,7 @@ del_fd(int fd)
 	}
 	return 1;
 }
- 
+
 
 
 int
@@ -122,17 +122,17 @@ smbc_init(smbc_get_auth_data_fn fn,
 		statcont = smbc_new_context();
 		if (!statcont) 
 			return -1;
-
+                
                 smbc_setDebug(statcont, debug);
                 smbc_setFunctionAuthData(statcont, fn);
-		
+                
 		if (!smbc_init_context(statcont)) {
 			smbc_free_context(statcont, False);
 			return -1;
 		}
-
+                
 		smbc_compat_initialized = 1;
-
+                
 		return 0;
 	}
 	return 0;
@@ -143,11 +143,11 @@ SMBCCTX *
 smbc_set_context(SMBCCTX * context)
 {
         SMBCCTX *old_context = statcont;
-
+        
         if (context) {
                 /* Save provided context.  It must have been initialized! */
                 statcont = context;
-
+                
                 /* You'd better know what you're doing.  We won't help you. */
 		smbc_compat_initialized = 1;
         }
@@ -163,11 +163,11 @@ smbc_open(const char *furl,
 {
 	SMBCFILE * file;
 	int fd;
-
+        
         file = smbc_getFunctionOpen(statcont)(statcont, furl, flags, mode);
 	if (!file)
 		return -1;
-
+        
 	fd = add_fd(file);
 	if (fd == -1) 
                 smbc_getFunctionClose(statcont)(statcont, file);
@@ -181,11 +181,11 @@ smbc_creat(const char *furl,
 {
 	SMBCFILE * file;
 	int fd;
-
+        
         file = smbc_getFunctionCreat(statcont)(statcont, furl, mode);
 	if (!file)
 		return -1;
-
+        
 	fd = add_fd(file);
 	if (fd == -1) {
 		/* Hmm... should we delete the file too ? I guess we could try */
@@ -250,15 +250,15 @@ smbc_opendir(const char *durl)
 {
 	SMBCFILE * file;
 	int fd;
-
+        
         file = smbc_getFunctionOpendir(statcont)(statcont, durl);
 	if (!file)
 		return -1;
-
+        
 	fd = add_fd(file);
 	if (fd == -1) 
                 smbc_getFunctionClosedir(statcont)(statcont, file);
-
+        
 	return fd;
 }
 
@@ -357,14 +357,14 @@ smbc_utime(const char *fname,
            struct utimbuf *utbuf)
 {
         struct timeval tv[2];
-
+        
         if (utbuf == NULL)
                 return smbc_getFunctionUtimes(statcont)(statcont, fname, NULL);
-
+        
         tv[0].tv_sec = utbuf->actime;
         tv[1].tv_sec = utbuf->modtime;
         tv[0].tv_usec = tv[1].tv_usec = 0;
-
+        
         return smbc_getFunctionUtimes(statcont)(statcont, fname, tv);
 }
 #endif
@@ -519,7 +519,7 @@ int
 smbc_open_print_job(const char *fname)
 {
         SMBCFILE * file;
-
+        
         file = smbc_getFunctionOpenPrintJob(statcont)(statcont, fname);
 	if (!file) return -1;
 	return file->cli_fd;
diff --git a/source3/libsmb/libsmb_context.c b/source3/libsmb/libsmb_context.c
index 6b7a19e1e4..8af49d12be 100644
--- a/source3/libsmb/libsmb_context.c
+++ b/source3/libsmb/libsmb_context.c
@@ -40,88 +40,88 @@ static int SMBC_initialized = 0;
 SMBCCTX *
 smbc_new_context(void)
 {
-    SMBCCTX *context;
-
-    /*
-     * All newly added context fields should be placed in SMBC_internal_data,
-     * not directly in SMBCCTX.
-     */
-#   undef OLD
-#   define OLD(field)      context->field
-#   undef NEW
-#   define NEW(field)      context->internal->field
-    
-    context = SMB_MALLOC_P(SMBCCTX);
-    if (!context) {
-        errno = ENOMEM;
-        return NULL;
-    }
-    
-    ZERO_STRUCTP(context);
-
-    context->internal = SMB_MALLOC_P(struct SMBC_internal_data);
-    if (!context->internal) {
-        SAFE_FREE(context);
-        errno = ENOMEM;
-        return NULL;
-    }
-
-    /* Initialize the context and establish reasonable defaults */
-    ZERO_STRUCTP(context->internal);
-    
-    OLD(config.debug)              = 0;
-    OLD(config.timeout)            = 20000; /* 20 seconds */
-    
-    NEW(full_time_names)           = False;
-    NEW(share_mode)                = SMBC_SHAREMODE_DENY_NONE;
-    NEW(smb_encryption_level)      = 0;
-    NEW(browse_max_lmb_count)      = 3;    /* # LMBs to query */
-    NEW(urlencode_readdir_entries) = False;
-    NEW(one_share_per_server)      = False;
-    
-    OLD(server.get_auth_data_fn)        = SMBC_get_auth_data;
-    OLD(server.check_server_fn)         = SMBC_check_server;
-    OLD(server.remove_unused_server_fn) = SMBC_remove_unused_server;
-    
-    OLD(cache.server_cache_data)        = NULL;
-    OLD(cache.add_cached_server_fn)     = SMBC_add_cached_server;
-    OLD(cache.get_cached_server_fn)     = SMBC_get_cached_server;
-    OLD(cache.remove_cached_server_fn)  = SMBC_remove_cached_server;
-    OLD(cache.purge_cached_servers_fn)  = SMBC_purge_cached_servers;
-    
-    OLD(posix_emu.open_fn)               = SMBC_open_ctx;
-    OLD(posix_emu.creat_fn)              = SMBC_creat_ctx;
-    OLD(posix_emu.read_fn)               = SMBC_read_ctx;
-    OLD(posix_emu.write_fn)              = SMBC_write_ctx;
-    OLD(posix_emu.close_fn)              = SMBC_close_ctx;
-    OLD(posix_emu.unlink_fn)             = SMBC_unlink_ctx;
-    OLD(posix_emu.rename_fn)             = SMBC_rename_ctx;
-    OLD(posix_emu.lseek_fn)              = SMBC_lseek_ctx;
-    NEW(posix_emu.ftruncate_fn)          = SMBC_ftruncate_ctx;
-    OLD(posix_emu.stat_fn)               = SMBC_stat_ctx;
-    OLD(posix_emu.fstat_fn)              = SMBC_fstat_ctx;
-    OLD(posix_emu.opendir_fn)            = SMBC_opendir_ctx;
-    OLD(posix_emu.closedir_fn)           = SMBC_closedir_ctx;
-    OLD(posix_emu.readdir_fn)            = SMBC_readdir_ctx;
-    OLD(posix_emu.getdents_fn)           = SMBC_getdents_ctx;
-    OLD(posix_emu.mkdir_fn)              = SMBC_mkdir_ctx;
-    OLD(posix_emu.rmdir_fn)              = SMBC_rmdir_ctx;
-    OLD(posix_emu.telldir_fn)            = SMBC_telldir_ctx;
-    OLD(posix_emu.lseekdir_fn)           = SMBC_lseekdir_ctx;
-    OLD(posix_emu.fstatdir_fn)           = SMBC_fstatdir_ctx;
-    OLD(posix_emu.chmod_fn)              = SMBC_chmod_ctx;
-    OLD(posix_emu.utimes_fn)             = SMBC_utimes_ctx;
-    OLD(posix_emu.setxattr_fn)           = SMBC_setxattr_ctx;
-    OLD(posix_emu.getxattr_fn)           = SMBC_getxattr_ctx;
-    OLD(posix_emu.removexattr_fn)        = SMBC_removexattr_ctx;
-    OLD(posix_emu.listxattr_fn)          = SMBC_listxattr_ctx;
-    
-    OLD(printing.open_print_job_fn)      = SMBC_open_print_job_ctx;
-    OLD(printing.print_file_fn)          = SMBC_print_file_ctx;
-    OLD(printing.list_print_jobs_fn)     = SMBC_list_print_jobs_ctx;
-    OLD(printing.unlink_print_job_fn)    = SMBC_unlink_print_job_ctx;
-    
-    return context;
+        SMBCCTX *context;
+        
+        /*
+         * All newly added context fields should be placed in
+         * SMBC_internal_data, not directly in SMBCCTX.
+         */
+#undef OLD
+#define OLD(field)      context->field
+#undef NEW
+#define NEW(field)      context->internal->field
+        
+        context = SMB_MALLOC_P(SMBCCTX);
+        if (!context) {
+                errno = ENOMEM;
+                return NULL;
+        }
+        
+        ZERO_STRUCTP(context);
+        
+        context->internal = SMB_MALLOC_P(struct SMBC_internal_data);
+        if (!context->internal) {
+                SAFE_FREE(context);
+                errno = ENOMEM;
+                return NULL;
+        }
+        
+        /* Initialize the context and establish reasonable defaults */
+        ZERO_STRUCTP(context->internal);
+        
+        OLD(config.debug)              = 0;
+        OLD(config.timeout)            = 20000; /* 20 seconds */
+        
+        NEW(full_time_names)           = False;
+        NEW(share_mode)                = SMBC_SHAREMODE_DENY_NONE;
+        NEW(smb_encryption_level)      = 0;
+        OLD(options.browse_max_lmb_count)      = 3;    /* # LMBs to query */
+        OLD(options.urlencode_readdir_entries) = False;
+        OLD(options.one_share_per_server)      = False;
+        
+        OLD(server.get_auth_data_fn)        = SMBC_get_auth_data;
+        OLD(server.check_server_fn)         = SMBC_check_server;
+        OLD(server.remove_unused_server_fn) = SMBC_remove_unused_server;
+        
+        OLD(cache.server_cache_data)        = NULL;
+        OLD(cache.add_cached_server_fn)     = SMBC_add_cached_server;
+        OLD(cache.get_cached_server_fn)     = SMBC_get_cached_server;
+        OLD(cache.remove_cached_server_fn)  = SMBC_remove_cached_server;
+        OLD(cache.purge_cached_servers_fn)  = SMBC_purge_cached_servers;
+        
+        OLD(posix_emu.open_fn)               = SMBC_open_ctx;
+        OLD(posix_emu.creat_fn)              = SMBC_creat_ctx;
+        OLD(posix_emu.read_fn)               = SMBC_read_ctx;
+        OLD(posix_emu.write_fn)              = SMBC_write_ctx;
+        OLD(posix_emu.close_fn)              = SMBC_close_ctx;
+        OLD(posix_emu.unlink_fn)             = SMBC_unlink_ctx;
+        OLD(posix_emu.rename_fn)             = SMBC_rename_ctx;
+        OLD(posix_emu.lseek_fn)              = SMBC_lseek_ctx;
+        NEW(posix_emu.ftruncate_fn)          = SMBC_ftruncate_ctx;
+        OLD(posix_emu.stat_fn)               = SMBC_stat_ctx;
+        OLD(posix_emu.fstat_fn)              = SMBC_fstat_ctx;
+        OLD(posix_emu.opendir_fn)            = SMBC_opendir_ctx;
+        OLD(posix_emu.closedir_fn)           = SMBC_closedir_ctx;
+        OLD(posix_emu.readdir_fn)            = SMBC_readdir_ctx;
+        OLD(posix_emu.getdents_fn)           = SMBC_getdents_ctx;
+        OLD(posix_emu.mkdir_fn)              = SMBC_mkdir_ctx;
+        OLD(posix_emu.rmdir_fn)              = SMBC_rmdir_ctx;
+        OLD(posix_emu.telldir_fn)            = SMBC_telldir_ctx;
+        OLD(posix_emu.lseekdir_fn)           = SMBC_lseekdir_ctx;
+        OLD(posix_emu.fstatdir_fn)           = SMBC_fstatdir_ctx;
+        OLD(posix_emu.chmod_fn)              = SMBC_chmod_ctx;
+        OLD(posix_emu.utimes_fn)             = SMBC_utimes_ctx;
+        OLD(posix_emu.setxattr_fn)           = SMBC_setxattr_ctx;
+        OLD(posix_emu.getxattr_fn)           = SMBC_getxattr_ctx;
+        OLD(posix_emu.removexattr_fn)        = SMBC_removexattr_ctx;
+        OLD(posix_emu.listxattr_fn)          = SMBC_listxattr_ctx;
+        
+        OLD(printing.open_print_job_fn)      = SMBC_open_print_job_ctx;
+        OLD(printing.print_file_fn)          = SMBC_print_file_ctx;
+        OLD(printing.list_print_jobs_fn)     = SMBC_list_print_jobs_ctx;
+        OLD(printing.unlink_print_job_fn)    = SMBC_unlink_print_job_ctx;
+        
+        return context;
 #undef OLD
 #undef NEW
 }
@@ -137,420 +137,268 @@ int
 smbc_free_context(SMBCCTX *context,
                   int shutdown_ctx)
 {
-    if (!context) {
-        errno = EBADF;
-        return 1;
-    }
-    
-    if (shutdown_ctx) {
-        SMBCFILE * f;
-        DEBUG(1,("Performing aggressive shutdown.\n"));
-        
-        f = context->internal->files;
-        while (f) {
-            (context->posix_emu.close_fn)(context, f);
-            f = f->next;
+        if (!context) {
+                errno = EBADF;
+                return 1;
         }
-        context->internal->files = NULL;
         
-        /* First try to remove the servers the nice way. */
-        if (context->cache.purge_cached_servers_fn(context)) {
-            SMBCSRV * s;
-            SMBCSRV * next;
-            DEBUG(1, ("Could not purge all servers, "
-                      "Nice way shutdown failed.\n"));
-            s = context->internal->servers;
-            while (s) {
-                DEBUG(1, ("Forced shutdown: %p (fd=%d)\n",
-                          s, s->cli->fd));
-                cli_shutdown(s->cli);
-                (context->cache.remove_cached_server_fn)(context,
-                                                         s);
-                next = s->next;
-                DLIST_REMOVE(context->internal->servers, s);
-                SAFE_FREE(s);
-                s = next;
-            }
-            context->internal->servers = NULL;
-        }
-    }
-    else {
-        /* This is the polite way */
-        if ((context->cache.purge_cached_servers_fn)(context)) {
-            DEBUG(1, ("Could not purge all servers, "
-                      "free_context failed.\n"));
-            errno = EBUSY;
-            return 1;
-        }
-        if (context->internal->servers) {
-            DEBUG(1, ("Active servers in context, "
-                      "free_context failed.\n"));
-            errno = EBUSY;
-            return 1;
+        if (shutdown_ctx) {
+                SMBCFILE * f;
+                DEBUG(1,("Performing aggressive shutdown.\n"));
+                
+                f = context->internal->files;
+                while (f) {
+                        (context->posix_emu.close_fn)(context, f);
+                        f = f->next;
+                }
+                context->internal->files = NULL;
+                
+                /* First try to remove the servers the nice way. */
+                if (context->cache.purge_cached_servers_fn(context)) {
+                        SMBCSRV * s;
+                        SMBCSRV * next;
+                        DEBUG(1, ("Could not purge all servers, "
+                                  "Nice way shutdown failed.\n"));
+                        s = context->internal->servers;
+                        while (s) {
+                                DEBUG(1, ("Forced shutdown: %p (fd=%d)\n",
+                                          s, s->cli->fd));
+                                cli_shutdown(s->cli);
+                                (context->cache.remove_cached_server_fn)(context,
+                                                                         s);
+                                next = s->next;
+                                DLIST_REMOVE(context->internal->servers, s);
+                                SAFE_FREE(s);
+                                s = next;
+                        }
+                        context->internal->servers = NULL;
+                }
         }
-        if (context->internal->files) {
-            DEBUG(1, ("Active files in context, "
-                      "free_context failed.\n"));
-            errno = EBUSY;
-            return 1;
+        else {
+                /* This is the polite way */
+                if ((context->cache.purge_cached_servers_fn)(context)) {
+                        DEBUG(1, ("Could not purge all servers, "
+                                  "free_context failed.\n"));
+                        errno = EBUSY;
+                        return 1;
+                }
+                if (context->internal->servers) {
+                        DEBUG(1, ("Active servers in context, "
+                                  "free_context failed.\n"));
+                        errno = EBUSY;
+                        return 1;
+                }
+                if (context->internal->files) {
+                        DEBUG(1, ("Active files in context, "
+                                  "free_context failed.\n"));
+                        errno = EBUSY;
+                        return 1;
+                }
         }
-    }
-    
-    /* Things we have to clean up */
-    SAFE_FREE(context->config.workgroup);
-    SAFE_FREE(context->config.netbios_name);
-    SAFE_FREE(context->config.user);
-    
-    DEBUG(3, ("Context %p successfully freed\n", context));
-    SAFE_FREE(context);
-    return 0;
+        
+        /* Things we have to clean up */
+        SAFE_FREE(context->config.workgroup);
+        SAFE_FREE(context->config.netbios_name);
+        SAFE_FREE(context->config.user);
+        
+        DEBUG(3, ("Context %p successfully freed\n", context));
+        SAFE_FREE(context);
+        return 0;
 }
 
 
-/*
- * Each time the context structure is changed, we have binary backward
- * compatibility issues.  Instead of modifying the public portions of the
- * context structure to add new options, instead, we put them in the internal
- * portion of the context structure and provide a set function for these new
- * options.
+/**
+ * Deprecated interface.  Do not use.  Instead, use the various
+ * smbc_setOption*() functions or smbc_setFunctionAuthDataWithContext().
  */
 void
 smbc_option_set(SMBCCTX *context,
                 char *option_name,
                 ... /* option_value */)
 {
-    va_list ap;
-    union {
-        int i;
-        bool b;
-        smbc_get_auth_data_with_context_fn auth_fn;
-        void *v;
-        const char *s;
-    } option_value;
-    
-    va_start(ap, option_name);
-    
-    if (strcmp(option_name, "debug_to_stderr") == 0) {
-        /*
-         * Log to standard error instead of standard output.
-         */
-        option_value.b = (bool) va_arg(ap, int);
-        context->internal->debug_stderr = option_value.b;
-        
-    } else if (strcmp(option_name, "full_time_names") == 0) {
-        /*
-         * Use new-style time attribute names, e.g. WRITE_TIME rather
-         * than the old-style names such as M_TIME.  This allows also
-         * setting/getting CREATE_TIME which was previously
-         * unimplemented.  (Note that the old C_TIME was supposed to
-         * be CHANGE_TIME but was confused and sometimes referred to
-         * CREATE_TIME.)
-         */
-        option_value.b = (bool) va_arg(ap, int);
-        context->internal->full_time_names = option_value.b;
-        
-    } else if (strcmp(option_name, "open_share_mode") == 0) {
-        /*
-         * The share mode to use for files opened with
-         * SMBC_open_ctx().  The default is SMBC_SHAREMODE_DENY_NONE.
-         */
-        option_value.i = va_arg(ap, int);
-        context->internal->share_mode = (smbc_share_mode) option_value.i;
-        
-    } else if (strcmp(option_name, "user_data") == 0) {
-        /*
-         * Save a user data handle which may be retrieved by the user
-         * with smbc_option_get()
-         */
-        option_value.v = va_arg(ap, void *);
-        context->internal->user_data = option_value.v;
-    } else if (strcmp(option_name, "smb_encrypt_level") == 0) {
-        /*
-         * Save an encoded value for encryption level.
-         * 0 = off, 1 = attempt, 2 = required.
-         */
-        option_value.s = va_arg(ap, const char *);
-        if (strcmp(option_value.s, "none") == 0) {
-            context->internal->smb_encryption_level = 0;
-        } else if (strcmp(option_value.s, "request") == 0) {
-            context->internal->smb_encryption_level = 1;
-        } else if (strcmp(option_value.s, "require") == 0) {
-            context->internal->smb_encryption_level = 2;
-        }
-    } else if (strcmp(option_name, "browse_max_lmb_count") == 0) {
-        /*
-         * From how many local master browsers should the list of
-         * workgroups be retrieved?  It can take up to 12 minutes or
-         * longer after a server becomes a local master browser, for
-         * it to have the entire browse list (the list of
-         * workgroups/domains) from an entire network.  Since a client
-         * never knows which local master browser will be found first,
-         * the one which is found first and used to retrieve a browse
-         * list may have an incomplete or empty browse list.  By
-         * requesting the browse list from multiple local master
-         * browsers, a more complete list can be generated.  For small
-         * networks (few workgroups), it is recommended that this
-         * value be set to 0, causing the browse lists from all found
-         * local master browsers to be retrieved and merged.  For
-         * networks with many workgroups, a suitable value for this
-         * variable is probably somewhere around 3. (Default: 3).
-         */
-        option_value.i = va_arg(ap, int);
-        context->internal->browse_max_lmb_count = option_value.i;
+        va_list ap;
+        union {
+                int i;
+                bool b;
+                smbc_get_auth_data_with_context_fn auth_fn;
+                void *v;
+                const char *s;
+        } option_value;
         
-    } else if (strcmp(option_name, "urlencode_readdir_entries") == 0) {
-        /*
-         * There is a difference in the desired return strings from
-         * smbc_readdir() depending upon whether the filenames are to
-         * be displayed to the user, or whether they are to be
-         * appended to the path name passed to smbc_opendir() to call
-         * a further smbc_ function (e.g. open the file with
-         * smbc_open()).  In the former case, the filename should be
-         * in "human readable" form.  In the latter case, the smbc_
-         * functions expect a URL which must be url-encoded.  Those
-         * functions decode the URL.  If, for example, smbc_readdir()
-         * returned a file name of "abc%20def.txt", passing a path
-         * with this file name attached to smbc_open() would cause
-         * smbc_open to attempt to open the file "abc def.txt" since
-         * the %20 is decoded into a space.
-         *
-         * Set this option to True if the names returned by
-         * smbc_readdir() should be url-encoded such that they can be
-         * passed back to another smbc_ call.  Set it to False if the
-         * names returned by smbc_readdir() are to be presented to the
-         * user.
-         *
-         * For backwards compatibility, this option defaults to False.
-         */
-        option_value.b = (bool) va_arg(ap, int);
-        context->internal->urlencode_readdir_entries = option_value.b;
+        va_start(ap, option_name);
         
-    } else if (strcmp(option_name, "one_share_per_server") == 0) {
-        /*
-         * Some Windows versions appear to have a limit to the number
-         * of concurrent SESSIONs and/or TREE CONNECTions.  In
-         * one-shot programs (i.e. the program runs and then quickly
-         * ends, thereby shutting down all connections), it is
-         * probably reasonable to establish a new connection for each
-         * share.  In long-running applications, the limitation can be
-         * avoided by using only a single connection to each server,
-         * and issuing a new TREE CONNECT when the share is accessed.
-         */
-        option_value.b = (bool) va_arg(ap, int);
-        context->options.one_share_per_server = option_value.b;
-        
-    } else if (strcmp(option_name, "use_kerberos") == 0) {
-        option_value.b = (bool) va_arg(ap, int);
-        if (option_value.b) {
-            context->flags.bits |= SMB_CTX_FLAG_USE_KERBEROS;
-        } else {
-            context->flags.bits &= ~SMB_CTX_FLAG_USE_KERBEROS;
-        }
-        
-    } else if (strcmp(option_name, "fallback_after_kerberos") == 0) {
-        option_value.b = (bool) va_arg(ap, int);
-        if (option_value.b) {
-            context->flags.bits |= SMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS;
-        } else {
-            context->flags.bits &= ~SMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS;
+        if (strcmp(option_name, "debug_to_stderr") == 0) {
+                option_value.b = (bool) va_arg(ap, int);
+                smbc_setOptionDebugToStderr(context, option_value.b);
+                
+        } else if (strcmp(option_name, "full_time_names") == 0) {
+                option_value.b = (bool) va_arg(ap, int);
+                smbc_setOptionFullTimeNames(context, option_value.b);
+                
+        } else if (strcmp(option_name, "open_share_mode") == 0) {
+                option_value.i = va_arg(ap, int);
+                smbc_setOptionOpenShareMode(context, option_value.i);
+                
+        } else if (strcmp(option_name, "auth_function") == 0) {
+                option_value.auth_fn =
+                        va_arg(ap, smbc_get_auth_data_with_context_fn);
+                smbc_setFunctionAuthDataWithContext(context, option_value.auth_fn);
+                
+        } else if (strcmp(option_name, "user_data") == 0) {
+                option_value.v = va_arg(ap, void *);
+                smbc_setOptionUserData(context, option_value.v);
+                
+        } else if (strcmp(option_name, "smb_encrypt_level") == 0) {
+                option_value.s = va_arg(ap, const char *);
+                if (strcmp(option_value.s, "none") == 0) {
+                        smbc_setOptionSmbEncryptionLevel(context,
+                                                         SMBC_ENCRYPTLEVEL_NONE);
+                } else if (strcmp(option_value.s, "request") == 0) {
+                        smbc_setOptionSmbEncryptionLevel(context,
+                                                         SMBC_ENCRYPTLEVEL_REQUEST);
+                } else if (strcmp(option_value.s, "require") == 0) {
+                        smbc_setOptionSmbEncryptionLevel(context,
+                                                         SMBC_ENCRYPTLEVEL_REQUIRE);
+                }
+                
+        } else if (strcmp(option_name, "browse_max_lmb_count") == 0) {
+                option_value.i = va_arg(ap, int);
+                smbc_setOptionBrowseMaxLmbCount(context, option_value.i);
+                
+        } else if (strcmp(option_name, "urlencode_readdir_entries") == 0) {
+                option_value.b = (bool) va_arg(ap, int);
+                smbc_setOptionUrlEncodeReaddirEntries(context, option_value.b);
+                
+        } else if (strcmp(option_name, "one_share_per_server") == 0) {
+                option_value.b = (bool) va_arg(ap, int);
+                smbc_setOptionOneSharePerServer(context, option_value.b);
+                
+        } else if (strcmp(option_name, "use_kerberos") == 0) {
+                option_value.b = (bool) va_arg(ap, int);
+                smbc_setOptionUseKerberos(context, option_value.b);
+                
+        } else if (strcmp(option_name, "fallback_after_kerberos") == 0) {
+                option_value.b = (bool) va_arg(ap, int);
+                smbc_setOptionFallbackAfterKerberos(context, option_value.b);
+                
+        } else if (strcmp(option_name, "no_auto_anonymous_login") == 0) {
+                option_value.b = (bool) va_arg(ap, int);
+                smbc_setOptionNoAutoAnonymousLogin(context, option_value.b);
         }
         
-    } else if (strcmp(option_name, "no_auto_anonymous_login") == 0) {
-        option_value.b = (bool) va_arg(ap, int);
-        if (option_value.b) {
-            context->flags.bits |= SMBCCTX_FLAG_NO_AUTO_ANONYMOUS_LOGON;
-        } else {
-            context->flags.bits &= ~SMBCCTX_FLAG_NO_AUTO_ANONYMOUS_LOGON;
-        }
-    }
-    
-    va_end(ap);
+        va_end(ap);
 }
 
 
 /*
- * Retrieve the current value of an option
+ * Deprecated interface.  Do not use.  Instead, use the various
+ * smbc_getOption*() functions.
  */
 void *
 smbc_option_get(SMBCCTX *context,
                 char *option_name)
 {
-    int             bits;
-
-    if (strcmp(option_name, "debug_stderr") == 0) {
-        /*
-         * Log to standard error instead of standard output.
-         */
+        int             bits;
+        
+        if (strcmp(option_name, "debug_stderr") == 0) {
 #if defined(__intptr_t_defined) || defined(HAVE_INTPTR_T)
-        return (void *) (intptr_t) context->internal->debug_stderr;
+                return (void *) (intptr_t) smbc_getOptionDebugToStderr(context);
 #else
-        return (void *) context->internal->debug_stderr;
+                return (void *) smbc_getOptionDebugToStderr(context);
 #endif
-        
-    } else if (strcmp(option_name, "full_time_names") == 0) {
-        /*
-         * Use new-style time attribute names, e.g. WRITE_TIME rather
-         * than the old-style names such as M_TIME.  This allows also
-         * setting/getting CREATE_TIME which was previously
-         * unimplemented.  (Note that the old C_TIME was supposed to
-         * be CHANGE_TIME but was confused and sometimes referred to
-         * CREATE_TIME.)
-         */
+                
+        } else if (strcmp(option_name, "full_time_names") == 0) {
 #if defined(__intptr_t_defined) || defined(HAVE_INTPTR_T)
-        return (void *) (intptr_t) context->internal->full_time_names;
+                return (void *) (intptr_t) smbc_getOptionFullTimeNames(context);
 #else
-        return (void *) context->internal->full_time_names;
+                return (void *) smbc_getOptionFullTimeNames(context);
 #endif
-        
-    } else if (strcmp(option_name, "user_data") == 0) {
-        /*
-         * Return the user data handle which was saved by the user
-         * with smbc_option_set()
-         */
-        return context->internal->user_data;
-        
-    } else if (strcmp(option_name, "smb_encrypt_level") == 0) {
-        /*
-         * Return the current smb encrypt negotiate option as a string.
-         */
-        switch (context->internal->smb_encryption_level) {
-        case 0:
-            return (void *) "none";
-        case 1:
-            return (void *) "request";
-        case 2:
-            return (void *) "require";
-        }
-        
-    } else if (strcmp(option_name, "smb_encrypt_on") == 0) {
-        /*
-         * Return the current smb encrypt status option as a bool.
-         * false = off, true = on. We don't know what server is
-         * being requested, so we only return true if all servers
-         * are using an encrypted connection.
-         */
-        SMBCSRV *s;
-        unsigned int num_servers = 0;
-        
-        for (s = context->internal->servers; s; s = s->next) {
-            num_servers++;
-            if (s->cli->trans_enc_state == NULL) {
-                return (void *)false;
-            }
-        }
+                
+        } else if (strcmp(option_name, "open_share_mode") == 0) {
 #if defined(__intptr_t_defined) || defined(HAVE_INTPTR_T)
-        return (void *) (intptr_t) (bool) (num_servers > 0);
+                return (void *) (intptr_t) smbc_getOptionOpenShareMode(context);
 #else
-        return (void *) (bool) (num_servers > 0);
+                return (void *) smbc_getOptionOpenShareMode(context);
 #endif
-        
-    } else if (strcmp(option_name, "browse_max_lmb_count") == 0) {
-        /*
-         * From how many local master browsers should the list of
-         * workgroups be retrieved?  It can take up to 12 minutes or
-         * longer after a server becomes a local master browser, for
-         * it to have the entire browse list (the list of
-         * workgroups/domains) from an entire network.  Since a client
-         * never knows which local master browser will be found first,
-         * the one which is found first and used to retrieve a browse
-         * list may have an incomplete or empty browse list.  By
-         * requesting the browse list from multiple local master
-         * browsers, a more complete list can be generated.  For small
-         * networks (few workgroups), it is recommended that this
-         * value be set to 0, causing the browse lists from all found
-         * local master browsers to be retrieved and merged.  For
-         * networks with many workgroups, a suitable value for this
-         * variable is probably somewhere around 3. (Default: 3).
-         */
+                
+        } else if (strcmp(option_name, "auth_function") == 0) {
+                return (void *) smbc_getFunctionAuthDataWithContext(context);
+                
+        } else if (strcmp(option_name, "user_data") == 0) {
+                return smbc_getOptionUserData(context);
+                
+        } else if (strcmp(option_name, "smb_encrypt_level") == 0) {
+                switch(smbc_getOptionSmbEncryptionLevel(context))
+                {
+                case 0:
+                        return (void *) "none";
+                case 1:
+                        return (void *) "request";
+                case 2:
+                        return (void *) "require";
+                }
+                
+        } else if (strcmp(option_name, "smb_encrypt_on") == 0) {
+                SMBCSRV *s;
+                unsigned int num_servers = 0;
+                
+                for (s = context->internal->servers; s; s = s->next) {
+                        num_servers++;
+                        if (s->cli->trans_enc_state == NULL) {
+                                return (void *)false;
+                        }
+                }
 #if defined(__intptr_t_defined) || defined(HAVE_INTPTR_T)
-        return (void *) (intptr_t) context->internal->browse_max_lmb_count;
+                return (void *) (intptr_t) (bool) (num_servers > 0);
 #else
-        return (void *) context->internal->browse_max_lmb_count;
+                return (void *) (bool) (num_servers > 0);
 #endif
-        
-    } else if (strcmp(option_name, "urlencode_readdir_entries") == 0) {
-        /*
-         * There is a difference in the desired return strings from
-         * smbc_readdir() depending upon whether the filenames are to
-         * be displayed to the user, or whether they are to be
-         * appended to the path name passed to smbc_opendir() to call
-         * a further smbc_ function (e.g. open the file with
-         * smbc_open()).  In the former case, the filename should be
-         * in "human readable" form.  In the latter case, the smbc_
-         * functions expect a URL which must be url-encoded.  Those
-         * functions decode the URL.  If, for example, smbc_readdir()
-         * returned a file name of "abc%20def.txt", passing a path
-         * with this file name attached to smbc_open() would cause
-         * smbc_open to attempt to open the file "abc def.txt" since
-         * the %20 is decoded into a space.
-         *
-         * Set this option to True if the names returned by
-         * smbc_readdir() should be url-encoded such that they can be
-         * passed back to another smbc_ call.  Set it to False if the
-         * names returned by smbc_readdir() are to be presented to the
-         * user.
-         *
-         * For backwards compatibility, this option defaults to False.
-         */
+                
+        } else if (strcmp(option_name, "browse_max_lmb_count") == 0) {
 #if defined(__intptr_t_defined) || defined(HAVE_INTPTR_T)
-        return (void *)(intptr_t) context->internal->urlencode_readdir_entries;
+                return (void *) (intptr_t) smbc_getOptionBrowseMaxLmbCount(context);
 #else
-        return (void *) (bool) context->internal->urlencode_readdir_entries;
+                return (void *) smbc_getOptionBrowseMaxLmbCount(context);
 #endif
-        
-    } else if (strcmp(option_name, "one_share_per_server") == 0) {
-        /*
-         * Some Windows versions appear to have a limit to the number
-         * of concurrent SESSIONs and/or TREE CONNECTions.  In
-         * one-shot programs (i.e. the program runs and then quickly
-         * ends, thereby shutting down all connections), it is
-         * probably reasonable to establish a new connection for each
-         * share.  In long-running applications, the limitation can be
-         * avoided by using only a single connection to each server,
-         * and issuing a new TREE CONNECT when the share is accessed.
-         */
+                
+        } else if (strcmp(option_name, "urlencode_readdir_entries") == 0) {
 #if defined(__intptr_t_defined) || defined(HAVE_INTPTR_T)
-        return (void *) (intptr_t) context->internal->one_share_per_server;
+                return (void *)(intptr_t) smbc_getOptionUrlEncodeReaddirEntries(context);
 #else
-        return (void *) (bool) context->internal->one_share_per_server;
+                return (void *) (bool) smbc_getOptionUrlEncodeReaddirEntries(context);
 #endif
-        
-    } else if (strcmp(option_name, "use_kerberos") == 0) {
-        bits = context->flags.bits;
+                
+        } else if (strcmp(option_name, "one_share_per_server") == 0) {
 #if defined(__intptr_t_defined) || defined(HAVE_INTPTR_T)
-        return (context->flags.bits & SMB_CTX_FLAG_USE_KERBEROS
-                ? (void *) (intptr_t) 1
-                : (void *) (intptr_t) 0);
+                return (void *) (intptr_t) smbc_getOptionOneSharePerServer(context);
 #else
-        return (context->flags.bits & SMB_CTX_FLAG_USE_KERBEROS
-                ? (void *) (bool) 1
-                : (void *) (bool) 0);
+                return (void *) (bool) smbc_getOptionOneSharePerServer(context);
 #endif
-        
-    } else if (strcmp(option_name, "fallback_after_kerberos") == 0) {
+                
+        } else if (strcmp(option_name, "use_kerberos") == 0) {
+                bits = context->flags.bits;
 #if defined(__intptr_t_defined) || defined(HAVE_INTPTR_T)
-        return (context->flags.bits & SMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS
-                ? (void *) (intptr_t) 1
-                : (void *) (intptr_t) 0);
+                return (void *) (intptr_t) smbc_getOptionUseKerberos(context);
 #else
-        return (context->flags.bits & SMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS
-                ? (void *) (bool) 1
-                : (void *) (bool) 0);
+                return (void *) (bool) smbc_getOptionUseKerberos(context);
 #endif
-        
-    } else if (strcmp(option_name, "no_auto_anonymous_login") == 0) {
+                
+        } else if (strcmp(option_name, "fallback_after_kerberos") == 0) {
 #if defined(__intptr_t_defined) || defined(HAVE_INTPTR_T)
-        return (context->flags.bits & SMBCCTX_FLAG_NO_AUTO_ANONYMOUS_LOGON
-                ? (void *) (intptr_t) 1
-                : (void *) (intptr_t) 0);
+                return (void *)(intptr_t) smbc_getOptionFallbackAfterKerberos(context);
 #else
-        return (context->flags.bits & SMBCCTX_FLAG_NO_AUTO_ANONYMOUS_LOGON
-                ? (void *) (bool) 1
-                : (void *) (bool) 0);
+                return (void *) (bool) smbc_getOptionFallbackAfterKerberos(context);
 #endif
-    }
-    
-    return NULL;
+                
+        } else if (strcmp(option_name, "no_auto_anonymous_login") == 0) {
+#if defined(__intptr_t_defined) || defined(HAVE_INTPTR_T)
+                return (void *) (intptr_t) smbc_getOptionNoAutoAnonymousLogin(context);
+#else
+                return (void *) (bool) smbc_getOptionNoAutoAnonymousLogin(context);
+#endif
+        }
+        
+        return NULL;
 }
 
 
@@ -564,175 +412,175 @@ smbc_option_get(SMBCCTX *context,
 SMBCCTX *
 smbc_init_context(SMBCCTX *context)
 {
-    int pid;
-    char *user = NULL;
-    char *home = NULL;
-    extern bool in_client;
-    
-    if (!context) {
-        errno = EBADF;
-        return NULL;
-    }
-    
-    /* Do not initialise the same client twice */
-    if (context->internal->initialized) {
-        return 0;
-    }
-    
-    if (!context->server.get_auth_data_fn ||
-        context->config.debug < 0 ||
-        context->config.debug > 100) {
+        int pid;
+        char *user = NULL;
+        char *home = NULL;
+        extern bool in_client;
         
-        errno = EINVAL;
-        return NULL;
-        
-    }
-    
-    if (!SMBC_initialized) {
-        /*
-         * Do some library-wide intializations the first time we get
-         * called
-         */
-        bool conf_loaded = False;
-        TALLOC_CTX *frame = talloc_stackframe();
-        
-        /* Set this to what the user wants */
-        DEBUGLEVEL = context->config.debug;
-        
-        load_case_tables();
-        
-        setup_logging("libsmbclient", True);
-        if (context->internal->debug_stderr) {
-            dbf = x_stderr;
-            x_setbuf(x_stderr, NULL);
+        if (!context) {
+                errno = EBADF;
+                return NULL;
         }
         
-        /* Here we would open the smb.conf file if needed ... */
+        /* Do not initialise the same client twice */
+        if (context->internal->initialized) {
+                return 0;
+        }
         
-        in_client = True; /* FIXME, make a param */
+        if (!context->server.get_auth_data_fn ||
+            context->config.debug < 0 ||
+            context->config.debug > 100) {
+                
+                errno = EINVAL;
+                return NULL;
+                
+        }
         
-        home = getenv("HOME");
-        if (home) {
-            char *conf = NULL;
-            if (asprintf(&conf, "%s/.smb/smb.conf", home) > 0) {
-                if (lp_load(conf, True, False, False, True)) {
-                    conf_loaded = True;
-                } else {
-                    DEBUG(5, ("Could not load config file: %s\n",
-                              conf));
+        if (!SMBC_initialized) {
+                /*
+                 * Do some library-wide intializations the first time we get
+                 * called
+                 */
+                bool conf_loaded = False;
+                TALLOC_CTX *frame = talloc_stackframe();
+                
+                /* Set this to what the user wants */
+                DEBUGLEVEL = context->config.debug;
+                
+                load_case_tables();
+                
+                setup_logging("libsmbclient", True);
+                if (context->internal->debug_stderr) {
+                        dbf = x_stderr;
+                        x_setbuf(x_stderr, NULL);
                 }
-                SAFE_FREE(conf);
-            }
+                
+                /* Here we would open the smb.conf file if needed ... */
+                
+                in_client = True; /* FIXME, make a param */
+                
+                home = getenv("HOME");
+                if (home) {
+                        char *conf = NULL;
+                        if (asprintf(&conf, "%s/.smb/smb.conf", home) > 0) {
+                                if (lp_load(conf, True, False, False, True)) {
+                                        conf_loaded = True;
+                                } else {
+                                        DEBUG(5, ("Could not load config file: %s\n",
+                                                  conf));
+                                }
+                                SAFE_FREE(conf);
+                        }
+                }
+                
+                if (!conf_loaded) {
+                        /*
+                         * Well, if that failed, try the get_dyn_CONFIGFILE
+                         * Which points to the standard locn, and if that
+                         * fails, silently ignore it and use the internal
+                         * defaults ...
+                         */
+                        
+                        if (!lp_load(get_dyn_CONFIGFILE(), True, False, False, False)) {
+                                DEBUG(5, ("Could not load config file: %s\n",
+                                          get_dyn_CONFIGFILE()));
+                        } else if (home) {
+                                char *conf;
+                                /*
+                                 * We loaded the global config file.  Now lets
+                                 * load user-specific modifications to the
+                                 * global config.
+                                 */
+                                if (asprintf(&conf,
+                                             "%s/.smb/smb.conf.append",
+                                             home) > 0) {
+                                        if (!lp_load(conf, True, False, False, False)) {
+                                                DEBUG(10,
+                                                      ("Could not append config file: "
+                                                       "%s\n",
+                                                       conf));
+                                        }
+                                        SAFE_FREE(conf);
+                                }
+                        }
+                }
+                
+                load_interfaces();  /* Load the list of interfaces ... */
+                
+                reopen_logs();  /* Get logging working ... */
+                
+                /*
+                 * Block SIGPIPE (from lib/util_sock.c: write())
+                 * It is not needed and should not stop execution
+                 */
+                BlockSignals(True, SIGPIPE);
+                
+                /* Done with one-time initialisation */
+                SMBC_initialized = 1;
+                
+                TALLOC_FREE(frame);
         }
         
-        if (!conf_loaded) {
-            /*
-             * Well, if that failed, try the get_dyn_CONFIGFILE
-             * Which points to the standard locn, and if that
-             * fails, silently ignore it and use the internal
-             * defaults ...
-             */
-            
-            if (!lp_load(get_dyn_CONFIGFILE(), True, False, False, False)) {
-                DEBUG(5, ("Could not load config file: %s\n",
-                          get_dyn_CONFIGFILE()));
-            } else if (home) {
-                char *conf;
+        if (!context->config.user) {
                 /*
-                 * We loaded the global config file.  Now lets
-                 * load user-specific modifications to the
-                 * global config.
+                 * FIXME: Is this the best way to get the user info?
                  */
-                if (asprintf(&conf,
-                             "%s/.smb/smb.conf.append",
-                             home) > 0) {
-                    if (!lp_load(conf, True, False, False, False)) {
-                        DEBUG(10,
-                              ("Could not append config file: "
-                               "%s\n",
-                               conf));
-                    }
-                    SAFE_FREE(conf);
+                user = getenv("USER");
+                /* walk around as "guest" if no username can be found */
+                if (!user) context->config.user = SMB_STRDUP("guest");
+                else context->config.user = SMB_STRDUP(user);
+        }
+        
+        if (!context->config.netbios_name) {
+                /*
+                 * We try to get our netbios name from the config. If that
+                 * fails we fall back on constructing our netbios name from
+                 * our hostname etc
+                 */
+                if (global_myname()) {
+                        context->config.netbios_name = SMB_STRDUP(global_myname());
+                }
+                else {
+                        /*
+                         * Hmmm, I want to get hostname as well, but I am too
+                         * lazy for the moment
+                         */
+                        pid = sys_getpid();
+                        context->config.netbios_name = (char *)SMB_MALLOC(17);
+                        if (!context->config.netbios_name) {
+                                errno = ENOMEM;
+                                return NULL;
+                        }
+                        slprintf(context->config.netbios_name, 16,
+                                 "smbc%s%d", context->config.user, pid);
+                }
+        }
+        
+        DEBUG(1, ("Using netbios name %s.\n", context->config.netbios_name));
+        
+        if (!context->config.workgroup) {
+                if (lp_workgroup()) {
+                        context->config.workgroup = SMB_STRDUP(lp_workgroup());
+                }
+                else {
+                        /* TODO: Think about a decent default workgroup */
+                        context->config.workgroup = SMB_STRDUP("samba");
                 }
-            }
         }
         
-        load_interfaces();  /* Load the list of interfaces ... */
+        DEBUG(1, ("Using workgroup %s.\n", context->config.workgroup));
         
-        reopen_logs();  /* Get logging working ... */
+        /* shortest timeout is 1 second */
+        if (context->config.timeout > 0 && context->config.timeout < 1000)
+                context->config.timeout = 1000;
         
         /*
-         * Block SIGPIPE (from lib/util_sock.c: write())
-         * It is not needed and should not stop execution
+         * FIXME: Should we check the function pointers here?
          */
-        BlockSignals(True, SIGPIPE);
         
-        /* Done with one-time initialisation */
-        SMBC_initialized = 1;
+        context->internal->initialized = True;
         
-        TALLOC_FREE(frame);
-    }
-    
-    if (!context->config.user) {
-        /*
-         * FIXME: Is this the best way to get the user info?
-         */
-        user = getenv("USER");
-        /* walk around as "guest" if no username can be found */
-        if (!user) context->config.user = SMB_STRDUP("guest");
-        else context->config.user = SMB_STRDUP(user);
-    }
-    
-    if (!context->config.netbios_name) {
-        /*
-         * We try to get our netbios name from the config. If that
-         * fails we fall back on constructing our netbios name from
-         * our hostname etc
-         */
-        if (global_myname()) {
-            context->config.netbios_name = SMB_STRDUP(global_myname());
-        }
-        else {
-            /*
-             * Hmmm, I want to get hostname as well, but I am too
-             * lazy for the moment
-             */
-            pid = sys_getpid();
-            context->config.netbios_name = (char *)SMB_MALLOC(17);
-            if (!context->config.netbios_name) {
-                errno = ENOMEM;
-                return NULL;
-            }
-            slprintf(context->config.netbios_name, 16,
-                     "smbc%s%d", context->config.user, pid);
-        }
-    }
-    
-    DEBUG(1, ("Using netbios name %s.\n", context->config.netbios_name));
-    
-    if (!context->config.workgroup) {
-        if (lp_workgroup()) {
-            context->config.workgroup = SMB_STRDUP(lp_workgroup());
-        }
-        else {
-            /* TODO: Think about a decent default workgroup */
-            context->config.workgroup = SMB_STRDUP("samba");
-        }
-    }
-    
-    DEBUG(1, ("Using workgroup %s.\n", context->config.workgroup));
-    
-    /* shortest timeout is 1 second */
-    if (context->config.timeout > 0 && context->config.timeout < 1000)
-        context->config.timeout = 1000;
-    
-    /*
-     * FIXME: Should we check the function pointers here?
-     */
-    
-    context->internal->initialized = True;
-    
-    return context;
+        return context;
 }
 
 
@@ -740,7 +588,7 @@ smbc_init_context(SMBCCTX *context)
 const char *
 smbc_version(void)
 {
-    return samba_version_string();
+        return samba_version_string();
 }
 
 
@@ -748,56 +596,56 @@ smbc_version(void)
 char *
 smbc_getNetbiosName(SMBCCTX *c)
 {
-    return c->config.netbios_name;
+        return c->config.netbios_name;
 }
 
 /** Set the netbios name used for making connections */
 void
 smbc_setNetbiosName(SMBCCTX *c, char * netbios_name)
 {
-    c->config.netbios_name = netbios_name;
+        c->config.netbios_name = netbios_name;
 }
 
 /** Get the workgroup used for making connections */
 char *
 smbc_getWorkgroup(SMBCCTX *c)
 {
-    return c->config.workgroup;
+        return c->config.workgroup;
 }
 
 /** Set the workgroup used for making connections */
 void
 smbc_setWorkgroup(SMBCCTX *c, char * workgroup)
 {
-    c->config.workgroup = workgroup;
+        c->config.workgroup = workgroup;
 }
 
 /** Get the username used for making connections */
 char *
 smbc_getUser(SMBCCTX *c)
 {
-    return c->config.user;
+        return c->config.user;
 }
 
 /** Set the username used for making connections */
 void
 smbc_setUser(SMBCCTX *c, char * user)
 {
-    c->config.user = user;
+        c->config.user = user;
 }
 
 /** Get the debug level */
 int
 smbc_getDebug(SMBCCTX *c)
 {
-    return c->config.debug;
+        return c->config.debug;
 }
 
 /** Set the debug level */
 void
 smbc_setDebug(SMBCCTX *c, int debug)
 {
-    c->config.debug = debug;
+        c->config.debug = debug;
 }
 
 /**
@@ -807,7 +655,7 @@ smbc_setDebug(SMBCCTX *c, int debug)
 int
 smbc_getTimeout(SMBCCTX *c)
 {
-    return c->config.timeout;
+        return c->config.timeout;
 }
 
 /**
@@ -817,43 +665,339 @@ smbc_getTimeout(SMBCCTX *c)
 void
 smbc_setTimeout(SMBCCTX *c, int timeout)
 {
-    c->config.timeout = timeout;
+        c->config.timeout = timeout;
 }
 
-/** Get the function for obtaining authentication data */
+/** Get whether to log to standard error instead of standard output */
+smbc_bool
+smbc_getOptionDebugToStderr(SMBCCTX *c)
+{
+        return c->internal->debug_stderr;
+}
+
+/** Set whether to log to standard error instead of standard output */
+void
+smbc_setOptionDebugToStderr(SMBCCTX *c, smbc_bool b)
+{
+        c->internal->debug_stderr = b;
+}
+
+/**
+ * Get whether to use new-style time attribute names, e.g. WRITE_TIME rather
+ * than the old-style names such as M_TIME.  This allows also setting/getting
+ * CREATE_TIME which was previously unimplemented.  (Note that the old C_TIME
+ * was supposed to be CHANGE_TIME but was confused and sometimes referred to
+ * CREATE_TIME.)
+ */
+smbc_bool
+smbc_getOptionFullTimeNames(SMBCCTX *c)
+{
+        return c->internal->full_time_names;
+}
+
+/**
+ * Set whether to use new-style time attribute names, e.g. WRITE_TIME rather
+ * than the old-style names such as M_TIME.  This allows also setting/getting
+ * CREATE_TIME which was previously unimplemented.  (Note that the old C_TIME
+ * was supposed to be CHANGE_TIME but was confused and sometimes referred to
+ * CREATE_TIME.)
+ */
+void
+smbc_setOptionFullTimeNames(SMBCCTX *c, smbc_bool b)
+{
+        c->internal->full_time_names = b;
+}
+
+/**
+ * Get the share mode to use for files opened with SMBC_open_ctx().  The
+ * default is SMBC_SHAREMODE_DENY_NONE.
+ */
+smbc_share_mode
+smbc_getOptionOpenShareMode(SMBCCTX *c)
+{
+        return c->internal->share_mode;
+}
+
+/**
+ * Set the share mode to use for files opened with SMBC_open_ctx().  The
+ * default is SMBC_SHAREMODE_DENY_NONE.
+ */
+void
+smbc_setOptionOpenShareMode(SMBCCTX *c, smbc_share_mode share_mode)
+{
+        c->internal->share_mode = share_mode;
+}
+
+/** Retrieve a previously set user data handle */
+void *
+smbc_getOptionUserData(SMBCCTX *c)
+{
+        return c->internal->user_data;
+}
+
+/** Save a user data handle */
+void
+smbc_setOptionUserData(SMBCCTX *c, void *user_data)
+{
+        c->internal->user_data = user_data;
+}
 
+/** Get the encoded value for encryption level. */
+smbc_smb_encrypt_level
+smbc_getOptionSmbEncryptionLevel(SMBCCTX *c)
+{
+        return c->internal->smb_encryption_level;
+}
+
+/** Set the encoded value for encryption level. */
+void
+smbc_setOptionSmbEncryptionLevel(SMBCCTX *c, smbc_smb_encrypt_level level)
+{
+        c->internal->smb_encryption_level = level;
+}
+
+/**
+ * Get from how many local master browsers should the list of workgroups be
+ * retrieved.  It can take up to 12 minutes or longer after a server becomes a
+ * local master browser, for it to have the entire browse list (the list of
+ * workgroups/domains) from an entire network.  Since a client never knows
+ * which local master browser will be found first, the one which is found
+ * first and used to retrieve a browse list may have an incomplete or empty
+ * browse list.  By requesting the browse list from multiple local master
+ * browsers, a more complete list can be generated.  For small networks (few
+ * workgroups), it is recommended that this value be set to 0, causing the
+ * browse lists from all found local master browsers to be retrieved and
+ * merged.  For networks with many workgroups, a suitable value for this
+ * variable is probably somewhere around 3. (Default: 3).
+ */
+int
+smbc_getOptionBrowseMaxLmbCount(SMBCCTX *c)
+{
+        return c->options.browse_max_lmb_count;
+}
+
+/**
+ * Set from how many local master browsers should the list of workgroups be
+ * retrieved.  It can take up to 12 minutes or longer after a server becomes a
+ * local master browser, for it to have the entire browse list (the list of
+ * workgroups/domains) from an entire network.  Since a client never knows
+ * which local master browser will be found first, the one which is found
+ * first and used to retrieve a browse list may have an incomplete or empty
+ * browse list.  By requesting the browse list from multiple local master
+ * browsers, a more complete list can be generated.  For small networks (few
+ * workgroups), it is recommended that this value be set to 0, causing the
+ * browse lists from all found local master browsers to be retrieved and
+ * merged.  For networks with many workgroups, a suitable value for this
+ * variable is probably somewhere around 3. (Default: 3).
+ */
+void
+smbc_setOptionBrowseMaxLmbCount(SMBCCTX *c, int count)
+{
+        c->options.browse_max_lmb_count = count;
+}
+
+/**
+ * Get whether to url-encode readdir entries.
+ *
+ * There is a difference in the desired return strings from
+ * smbc_readdir() depending upon whether the filenames are to
+ * be displayed to the user, or whether they are to be
+ * appended to the path name passed to smbc_opendir() to call
+ * a further smbc_ function (e.g. open the file with
+ * smbc_open()).  In the former case, the filename should be
+ * in "human readable" form.  In the latter case, the smbc_
+ * functions expect a URL which must be url-encoded.  Those
+ * functions decode the URL.  If, for example, smbc_readdir()
+ * returned a file name of "abc%20def.txt", passing a path
+ * with this file name attached to smbc_open() would cause
+ * smbc_open to attempt to open the file "abc def.txt" since
+ * the %20 is decoded into a space.
+ *
+ * Set this option to True if the names returned by
+ * smbc_readdir() should be url-encoded such that they can be
+ * passed back to another smbc_ call.  Set it to False if the
+ * names returned by smbc_readdir() are to be presented to the
+ * user.
+ *
+ * For backwards compatibility, this option defaults to False.
+ */
+smbc_bool
+smbc_getOptionUrlEncodeReaddirEntries(SMBCCTX *c)
+{
+        return c->options.urlencode_readdir_entries;
+}
+
+/**
+ * Set whether to url-encode readdir entries.
+ *
+ * There is a difference in the desired return strings from
+ * smbc_readdir() depending upon whether the filenames are to
+ * be displayed to the user, or whether they are to be
+ * appended to the path name passed to smbc_opendir() to call
+ * a further smbc_ function (e.g. open the file with
+ * smbc_open()).  In the former case, the filename should be
+ * in "human readable" form.  In the latter case, the smbc_
+ * functions expect a URL which must be url-encoded.  Those
+ * functions decode the URL.  If, for example, smbc_readdir()
+ * returned a file name of "abc%20def.txt", passing a path
+ * with this file name attached to smbc_open() would cause
+ * smbc_open to attempt to open the file "abc def.txt" since
+ * the %20 is decoded into a space.
+ *
+ * Set this option to True if the names returned by
+ * smbc_readdir() should be url-encoded such that they can be
+ * passed back to another smbc_ call.  Set it to False if the
+ * names returned by smbc_readdir() are to be presented to the
+ * user.
+ *
+ * For backwards compatibility, this option defaults to False.
+ */
+void
+smbc_setOptionUrlEncodeReaddirEntries(SMBCCTX *c, smbc_bool b)
+{
+        c->options.urlencode_readdir_entries = b;
+}
+
+/**
+ * Get whether to use the same connection for all shares on a server.
+ *
+ * Some Windows versions appear to have a limit to the number
+ * of concurrent SESSIONs and/or TREE CONNECTions.  In
+ * one-shot programs (i.e. the program runs and then quickly
+ * ends, thereby shutting down all connections), it is
+ * probably reasonable to establish a new connection for each
+ * share.  In long-running applications, the limitation can be
+ * avoided by using only a single connection to each server,
+ * and issuing a new TREE CONNECT when the share is accessed.
+ */
+smbc_bool
+smbc_getOptionOneSharePerServer(SMBCCTX *c)
+{
+        return c->options.one_share_per_server;
+}
+
+/**
+ * Set whether to use the same connection for all shares on a server.
+ *
+ * Some Windows versions appear to have a limit to the number
+ * of concurrent SESSIONs and/or TREE CONNECTions.  In
+ * one-shot programs (i.e. the program runs and then quickly
+ * ends, thereby shutting down all connections), it is
+ * probably reasonable to establish a new connection for each
+ * share.  In long-running applications, the limitation can be
+ * avoided by using only a single connection to each server,
+ * and issuing a new TREE CONNECT when the share is accessed.
+ */
+void
+smbc_setOptionOneSharePerServer(SMBCCTX *c, smbc_bool b)
+{
+        c->options.one_share_per_server = b;
+}
+
+/** Get whether to enable use of kerberos */
+smbc_bool
+smbc_getOptionUseKerberos(SMBCCTX *c)
+{
+        return c->flags.bits & SMB_CTX_FLAG_USE_KERBEROS ? True : False;
+}
+
+/** Set whether to enable use of kerberos */
+void
+smbc_setOptionUseKerberos(SMBCCTX *c, smbc_bool b)
+{
+        if (b) {
+                c->flags.bits |= SMB_CTX_FLAG_USE_KERBEROS;
+        } else {
+                c->flags.bits &= ~SMB_CTX_FLAG_USE_KERBEROS;
+        }
+}
+
+/** Get whether to fallback after kerberos */
+smbc_bool
+smbc_getOptionFallbackAfterKerberos(SMBCCTX *c)
+{
+        return c->flags.bits & SMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS ? True : False;
+}
+
+/** Set whether to fallback after kerberos */
+void
+smbc_setOptionFallbackAfterKerberos(SMBCCTX *c, smbc_bool b)
+{
+        if (b) {
+                c->flags.bits |= SMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS;
+        } else {
+                c->flags.bits &= ~SMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS;
+        }
+}
+
+/** Get whether to automatically select anonymous login */
+smbc_bool
+smbc_getOptionNoAutoAnonymousLogin(SMBCCTX *c)
+{
+        return c->flags.bits & SMBCCTX_FLAG_NO_AUTO_ANONYMOUS_LOGON ? True : False;
+}
+
+/** Set whether to automatically select anonymous login */
+void
+smbc_setOptionNoAutoAnonymousLogin(SMBCCTX *c, smbc_bool b)
+{
+        if (b) {
+                c->flags.bits |= SMBCCTX_FLAG_NO_AUTO_ANONYMOUS_LOGON;
+        } else {
+                c->flags.bits &= ~SMBCCTX_FLAG_NO_AUTO_ANONYMOUS_LOGON;
+        }
+}
+
+/** Get the function for obtaining authentication data */
 smbc_get_auth_data_fn
 smbc_getFunctionAuthData(SMBCCTX *c)
 {
-    return c->server.get_auth_data_fn;
+        return c->server.get_auth_data_fn;
 }
 
 /** Set the function for obtaining authentication data */
 void
 smbc_setFunctionAuthData(SMBCCTX *c, smbc_get_auth_data_fn fn)
 {
-    c->server.get_auth_data_fn = fn;
+        c->internal->auth_fn_with_context = NULL;
+        c->server.get_auth_data_fn = fn;
+}
+
+/** Get the new-style authentication function which includes the context. */
+smbc_get_auth_data_with_context_fn
+smbc_getFunctionAuthDataWithContext(SMBCCTX *c)
+{
+        return c->internal->auth_fn_with_context;
+}
+
+/** Set the new-style authentication function which includes the context. */
+void
+smbc_setFunctionAuthDataWithContext(SMBCCTX *c,
+                                    smbc_get_auth_data_with_context_fn fn)
+{
+        c->server.get_auth_data_fn = NULL;
+        c->internal->auth_fn_with_context = fn;
 }
 
 /** Get the function for checking if a server is still good */
 smbc_check_server_fn
 smbc_getFunctionCheckServer(SMBCCTX *c)
 {
-    return c->server.check_server_fn;
+        return c->server.check_server_fn;
 }
 
 /** Set the function for checking if a server is still good */
 void
 smbc_setFunctionCheckServer(SMBCCTX *c, smbc_check_server_fn fn)
 {
-    c->server.check_server_fn = fn;
+        c->server.check_server_fn = fn;
 }
 
 /** Get the function for removing a server if unused */
 smbc_remove_unused_server_fn
 smbc_getFunctionRemoveUnusedServer(SMBCCTX *c)
 {
-    return c->server.remove_unused_server_fn;
+        return c->server.remove_unused_server_fn;
 }
 
 /** Set the function for removing a server if unused */
@@ -861,21 +1005,21 @@ void
 smbc_setFunctionRemoveUnusedServer(SMBCCTX *c,
                                    smbc_remove_unused_server_fn fn)
 {
-    c->server.remove_unused_server_fn = fn;
+        c->server.remove_unused_server_fn = fn;
 }
 
 /** Get the function to store private data of the server cache */
 struct
 smbc_server_cache * smbc_getServerCacheData(SMBCCTX *c)
 {
-    return c->cache.server_cache_data;
+        return c->cache.server_cache_data;
 }
 
 /** Set the function to store private data of the server cache */
 void
 smbc_setServerCacheData(SMBCCTX *c, struct smbc_server_cache * cache)
 {
-    c->cache.server_cache_data = cache;
+        c->cache.server_cache_data = cache;
 }
 
 
@@ -883,35 +1027,35 @@ smbc_setServerCacheData(SMBCCTX *c, struct smbc_server_cache * cache)
 smbc_add_cached_srv_fn
 smbc_getFunctionAddCachedServer(SMBCCTX *c)
 {
-    return c->cache.add_cached_server_fn;
+        return c->cache.add_cached_server_fn;
 }
 
 /** Set the function for adding a cached server */
 void
 smbc_setFunctionAddCachedServer(SMBCCTX *c, smbc_add_cached_srv_fn fn)
 {
-    c->cache.add_cached_server_fn = fn;
+        c->cache.add_cached_server_fn = fn;
 }
 
 /** Get the function for server cache lookup */
 smbc_get_cached_srv_fn
 smbc_getFunctionGetCachedServer(SMBCCTX *c)
 {
-    return c->cache.get_cached_server_fn;
+        return c->cache.get_cached_server_fn;
 }
 
 /** Set the function for server cache lookup */
 void
 smbc_setFunctionGetCachedServer(SMBCCTX *c, smbc_get_cached_srv_fn fn)
 {
-    c->cache.get_cached_server_fn = fn;
+        c->cache.get_cached_server_fn = fn;
 }
 
 /** Get the function for server cache removal */
 smbc_remove_cached_srv_fn
 smbc_getFunctionRemoveCachedServer(SMBCCTX *c)
 {
-    return c->cache.remove_cached_server_fn;
+        return c->cache.remove_cached_server_fn;
 }
 
 /** Set the function for server cache removal */
@@ -919,7 +1063,7 @@ void
 smbc_setFunctionRemoveCachedServer(SMBCCTX *c,
                                    smbc_remove_cached_srv_fn fn)
 {
-    c->cache.remove_cached_server_fn = fn;
+        c->cache.remove_cached_server_fn = fn;
 }
 
 /**
@@ -929,7 +1073,7 @@ smbc_setFunctionRemoveCachedServer(SMBCCTX *c,
 smbc_purge_cached_srv_fn
 smbc_getFunctionPurgeCachedServers(SMBCCTX *c)
 {
-    return c->cache.purge_cached_servers_fn;
+        return c->cache.purge_cached_servers_fn;
 }
 
 /**
@@ -939,7 +1083,7 @@ smbc_getFunctionPurgeCachedServers(SMBCCTX *c)
 void
 smbc_setFunctionPurgeCachedServers(SMBCCTX *c, smbc_purge_cached_srv_fn fn)
 {
-    c->cache.purge_cached_servers_fn = fn;
+        c->cache.purge_cached_servers_fn = fn;
 }
 
 /**
@@ -949,133 +1093,133 @@ smbc_setFunctionPurgeCachedServers(SMBCCTX *c, smbc_purge_cached_srv_fn fn)
 smbc_open_fn
 smbc_getFunctionOpen(SMBCCTX *c)
 {
-    return c->posix_emu.open_fn;
+        return c->posix_emu.open_fn;
 }
 
 void
 smbc_setFunctionOpen(SMBCCTX *c, smbc_open_fn fn)
 {
-    c->posix_emu.open_fn = fn;
+        c->posix_emu.open_fn = fn;
 }
 
 smbc_creat_fn
 smbc_getFunctionCreat(SMBCCTX *c)
 {
-    return c->posix_emu.creat_fn;
+        return c->posix_emu.creat_fn;
 }
 
 void
 smbc_setFunctionCreat(SMBCCTX *c, smbc_creat_fn fn)
 {
-    c->posix_emu.creat_fn = fn;
+        c->posix_emu.creat_fn = fn;
 }
 
 smbc_read_fn
 smbc_getFunctionRead(SMBCCTX *c)
 {
-    return c->posix_emu.read_fn;
+        return c->posix_emu.read_fn;
 }
 
 void
 smbc_setFunctionRead(SMBCCTX *c, smbc_read_fn fn)
 {
-    c->posix_emu.read_fn = fn;
+        c->posix_emu.read_fn = fn;
 }
 
 smbc_write_fn
 smbc_getFunctionWrite(SMBCCTX *c)
 {
-    return c->posix_emu.write_fn;
+        return c->posix_emu.write_fn;
 }
 
 void
 smbc_setFunctionWrite(SMBCCTX *c, smbc_write_fn fn)
 {
-    c->posix_emu.write_fn = fn;
+        c->posix_emu.write_fn = fn;
 }
 
 smbc_unlink_fn
 smbc_getFunctionUnlink(SMBCCTX *c)
 {
-    return c->posix_emu.unlink_fn;
+        return c->posix_emu.unlink_fn;
 }
 
 void
 smbc_setFunctionUnlink(SMBCCTX *c, smbc_unlink_fn fn)
 {
-    c->posix_emu.unlink_fn = fn;
+        c->posix_emu.unlink_fn = fn;
 }
 
 smbc_rename_fn
 smbc_getFunctionRename(SMBCCTX *c)
 {
-    return c->posix_emu.rename_fn;
+        return c->posix_emu.rename_fn;
 }
 
 void
 smbc_setFunctionRename(SMBCCTX *c, smbc_rename_fn fn)
 {
-    c->posix_emu.rename_fn = fn;
+        c->posix_emu.rename_fn = fn;
 }
 
 smbc_lseek_fn
 smbc_getFunctionLseek(SMBCCTX *c)
 {
-    return c->posix_emu.lseek_fn;
+        return c->posix_emu.lseek_fn;
 }
 
 void
 smbc_setFunctionLseek(SMBCCTX *c, smbc_lseek_fn fn)
 {
-    c->posix_emu.lseek_fn = fn;
+        c->posix_emu.lseek_fn = fn;
 }
 
 smbc_stat_fn
 smbc_getFunctionStat(SMBCCTX *c)
 {
-    return c->posix_emu.stat_fn;
+        return c->posix_emu.stat_fn;
 }
 
 void
 smbc_setFunctionStat(SMBCCTX *c, smbc_stat_fn fn)
 {
-    c->posix_emu.stat_fn = fn;
+        c->posix_emu.stat_fn = fn;
 }
 
 smbc_fstat_fn
 smbc_getFunctionFstat(SMBCCTX *c)
 {
-    return c->posix_emu.fstat_fn;
+        return c->posix_emu.fstat_fn;
 }
 
 void
 smbc_setFunctionFstat(SMBCCTX *c, smbc_fstat_fn fn)
 {
-    c->posix_emu.fstat_fn = fn;
+        c->posix_emu.fstat_fn = fn;
 }
 
 smbc_ftruncate_fn
 smbc_getFunctionFtruncate(SMBCCTX *c)
 {
-    return c->internal->posix_emu.ftruncate_fn;
+        return c->internal->posix_emu.ftruncate_fn;
 }
 
 void
 smbc_setFunctionFtruncate(SMBCCTX *c, smbc_ftruncate_fn fn)
 {
-    c->internal->posix_emu.ftruncate_fn = fn;
+        c->internal->posix_emu.ftruncate_fn = fn;
 }
 
 smbc_close_fn
 smbc_getFunctionClose(SMBCCTX *c)
 {
-    return c->posix_emu.close_fn;
+        return c->posix_emu.close_fn;
 }
 
 void
 smbc_setFunctionClose(SMBCCTX *c, smbc_close_fn fn)
 {
-    c->posix_emu.close_fn = fn;
+        c->posix_emu.close_fn = fn;
 }
 
 
@@ -1086,109 +1230,109 @@ smbc_setFunctionClose(SMBCCTX *c, smbc_close_fn fn)
 smbc_opendir_fn
 smbc_getFunctionOpendir(SMBCCTX *c)
 {
-    return c->posix_emu.opendir_fn;
+        return c->posix_emu.opendir_fn;
 }
 
 void
 smbc_setFunctionOpendir(SMBCCTX *c, smbc_opendir_fn fn)
 {
-    c->posix_emu.opendir_fn = fn;
+        c->posix_emu.opendir_fn = fn;
 }
 
 smbc_closedir_fn
 smbc_getFunctionClosedir(SMBCCTX *c)
 {
-    return c->posix_emu.closedir_fn;
+        return c->posix_emu.closedir_fn;
 }
 
 void
 smbc_setFunctionClosedir(SMBCCTX *c, smbc_closedir_fn fn)
 {
-    c->posix_emu.closedir_fn = fn;
+        c->posix_emu.closedir_fn = fn;
 }
 
 smbc_readdir_fn
 smbc_getFunctionReaddir(SMBCCTX *c)
 {
-    return c->posix_emu.readdir_fn;
+        return c->posix_emu.readdir_fn;
 }
 
 void
 smbc_setFunctionReaddir(SMBCCTX *c, smbc_readdir_fn fn)
 {
-    c->posix_emu.readdir_fn = fn;
+        c->posix_emu.readdir_fn = fn;
 }
 
 smbc_getdents_fn
 smbc_getFunctionGetdents(SMBCCTX *c)
 {
-    return c->posix_emu.getdents_fn;
+        return c->posix_emu.getdents_fn;
 }
 
 void
 smbc_setFunctionGetdents(SMBCCTX *c, smbc_getdents_fn fn)
 {
-    c->posix_emu.getdents_fn = fn;
+        c->posix_emu.getdents_fn = fn;
 }
 
 smbc_mkdir_fn
 smbc_getFunctionMkdir(SMBCCTX *c)
 {
-    return c->posix_emu.mkdir_fn;
+        return c->posix_emu.mkdir_fn;
 }
 
 void
 smbc_setFunctionMkdir(SMBCCTX *c, smbc_mkdir_fn fn)
 {
-    c->posix_emu.mkdir_fn = fn;
+        c->posix_emu.mkdir_fn = fn;
 }
 
 smbc_rmdir_fn
 smbc_getFunctionRmdir(SMBCCTX *c)
 {
-    return c->posix_emu.rmdir_fn;
+        return c->posix_emu.rmdir_fn;
 }
 
 void
 smbc_setFunctionRmdir(SMBCCTX *c, smbc_rmdir_fn fn)
 {
-    c->posix_emu.rmdir_fn = fn;
+        c->posix_emu.rmdir_fn = fn;
 }
 
 smbc_telldir_fn
 smbc_getFunctionTelldir(SMBCCTX *c)
 {
-    return c->posix_emu.telldir_fn;
+        return c->posix_emu.telldir_fn;
 }
 
 void
 smbc_setFunctionTelldir(SMBCCTX *c, smbc_telldir_fn fn)
 {
-    c->posix_emu.telldir_fn = fn;
+        c->posix_emu.telldir_fn = fn;
 }
 
 smbc_lseekdir_fn
 smbc_getFunctionLseekdir(SMBCCTX *c)
 {
-    return c->posix_emu.lseekdir_fn;
+        return c->posix_emu.lseekdir_fn;
 }
 
 void
 smbc_setFunctionLseekdir(SMBCCTX *c, smbc_lseekdir_fn fn)
 {
-    c->posix_emu.lseekdir_fn = fn;
+        c->posix_emu.lseekdir_fn = fn;
 }
 
 smbc_fstatdir_fn
 smbc_getFunctionFstatdir(SMBCCTX *c)
 {
-    return c->posix_emu.fstatdir_fn;
+        return c->posix_emu.fstatdir_fn;
 }
 
 void
 smbc_setFunctionFstatdir(SMBCCTX *c, smbc_fstatdir_fn fn)
 {
-    c->posix_emu.fstatdir_fn = fn;
+        c->posix_emu.fstatdir_fn = fn;
 }
 
 
@@ -1199,73 +1343,73 @@ smbc_setFunctionFstatdir(SMBCCTX *c, smbc_fstatdir_fn fn)
 smbc_chmod_fn
 smbc_getFunctionChmod(SMBCCTX *c)
 {
-    return c->posix_emu.chmod_fn;
+        return c->posix_emu.chmod_fn;
 }
 
 void
 smbc_setFunctionChmod(SMBCCTX *c, smbc_chmod_fn fn)
 {
-    c->posix_emu.chmod_fn = fn;
+        c->posix_emu.chmod_fn = fn;
 }
 
 smbc_utimes_fn
 smbc_getFunctionUtimes(SMBCCTX *c)
 {
-    return c->posix_emu.utimes_fn;
+        return c->posix_emu.utimes_fn;
 }
 
 void
 smbc_setFunctionUtimes(SMBCCTX *c, smbc_utimes_fn fn)
 {
-    c->posix_emu.utimes_fn = fn;
+        c->posix_emu.utimes_fn = fn;
 }
 
 smbc_setxattr_fn
 smbc_getFunctionSetxattr(SMBCCTX *c)
 {
-    return c->posix_emu.setxattr_fn;
+        return c->posix_emu.setxattr_fn;
 }
 
 void
 smbc_setFunctionSetxattr(SMBCCTX *c, smbc_setxattr_fn fn)
 {
-    c->posix_emu.setxattr_fn = fn;
+        c->posix_emu.setxattr_fn = fn;
 }
 
 smbc_getxattr_fn
 smbc_getFunctionGetxattr(SMBCCTX *c)
 {
-    return c->posix_emu.getxattr_fn;
+        return c->posix_emu.getxattr_fn;
 }
 
 void
 smbc_setFunctionGetxattr(SMBCCTX *c, smbc_getxattr_fn fn)
 {
-    c->posix_emu.getxattr_fn = fn;
+        c->posix_emu.getxattr_fn = fn;
 }
 
 smbc_removexattr_fn
 smbc_getFunctionRemovexattr(SMBCCTX *c)
 {
-    return c->posix_emu.removexattr_fn;
+        return c->posix_emu.removexattr_fn;
 }
 
 void
 smbc_setFunctionRemovexattr(SMBCCTX *c, smbc_removexattr_fn fn)
 {
-    c->posix_emu.removexattr_fn = fn;
+        c->posix_emu.removexattr_fn = fn;
 }
 
 smbc_listxattr_fn
 smbc_getFunctionListxattr(SMBCCTX *c)
 {
-    return c->posix_emu.listxattr_fn;
+        return c->posix_emu.listxattr_fn;
 }
 
 void
 smbc_setFunctionListxattr(SMBCCTX *c, smbc_listxattr_fn fn)
 {
-    c->posix_emu.listxattr_fn = fn;
+        c->posix_emu.listxattr_fn = fn;
 }
 
 
@@ -1276,51 +1420,51 @@ smbc_setFunctionListxattr(SMBCCTX *c, smbc_listxattr_fn fn)
 smbc_print_file_fn
 smbc_getFunctionPrintFile(SMBCCTX *c)
 {
-    return c->printing.print_file_fn;
+        return c->printing.print_file_fn;
 }
 
 void
 smbc_setFunctionPrintFile(SMBCCTX *c, smbc_print_file_fn fn)
 {
-    c->printing.print_file_fn = fn;
+        c->printing.print_file_fn = fn;
 }
 
 smbc_open_print_job_fn
 smbc_getFunctionOpenPrintJob(SMBCCTX *c)
 {
-    return c->printing.open_print_job_fn;
+        return c->printing.open_print_job_fn;
 }
 
 void
 smbc_setFunctionOpenPrintJob(SMBCCTX *c,
                              smbc_open_print_job_fn fn)
 {
-    c->printing.open_print_job_fn = fn;
+        c->printing.open_print_job_fn = fn;
 }
 
 smbc_list_print_jobs_fn
 smbc_getFunctionListPrintJobs(SMBCCTX *c)
 {
-    return c->printing.list_print_jobs_fn;
+        return c->printing.list_print_jobs_fn;
 }
 
 void
 smbc_setFunctionListPrintJobs(SMBCCTX *c,
                               smbc_list_print_jobs_fn fn)
 {
-    c->printing.list_print_jobs_fn = fn;
+        c->printing.list_print_jobs_fn = fn;
 }
 
 smbc_unlink_print_job_fn
 smbc_getFunctionUnlinkPrintJob(SMBCCTX *c)
 {
-    return c->printing.unlink_print_job_fn;
+        return c->printing.unlink_print_job_fn;
 }
 
 void
 smbc_setFunctionUnlinkPrintJob(SMBCCTX *c,
-                                smbc_unlink_print_job_fn fn)
+                               smbc_unlink_print_job_fn fn)
 {
-    c->printing.unlink_print_job_fn = fn;
+        c->printing.unlink_print_job_fn = fn;
 }
 
diff --git a/source3/libsmb/libsmb_dir.c b/source3/libsmb/libsmb_dir.c
index 25020762a2..2ece2ab8ed 100644
--- a/source3/libsmb/libsmb_dir.c
+++ b/source3/libsmb/libsmb_dir.c
@@ -36,19 +36,19 @@ static void
 remove_dir(SMBCFILE *dir)
 {
 	struct smbc_dir_list *d,*f;
-
+        
 	d = dir->dir_list;
 	while (d) {
-
+                
 		f = d; d = d->next;
-
+                
 		SAFE_FREE(f->dirent);
 		SAFE_FREE(f);
-
+                
 	}
-
+        
 	dir->dir_list = dir->dir_end = dir->dir_next = NULL;
-
+        
 }
 
 static int
@@ -61,63 +61,63 @@ add_dirent(SMBCFILE *dir,
 	int size;
         int name_length = (name == NULL ? 0 : strlen(name));
         int comment_len = (comment == NULL ? 0 : strlen(comment));
-
+        
 	/*
 	 * Allocate space for the dirent, which must be increased by the 
 	 * size of the name and the comment and 1 each for the null terminator.
 	 */
-
+        
 	size = sizeof(struct smbc_dirent) + name_length + comment_len + 2;
-    
+        
 	dirent = (struct smbc_dirent *)SMB_MALLOC(size);
-
+        
 	if (!dirent) {
-
+                
 		dir->dir_error = ENOMEM;
 		return -1;
-
+                
 	}
-
+        
 	ZERO_STRUCTP(dirent);
-
+        
 	if (dir->dir_list == NULL) {
-
+                
 		dir->dir_list = SMB_MALLOC_P(struct smbc_dir_list);
 		if (!dir->dir_list) {
-
+                        
 			SAFE_FREE(dirent);
 			dir->dir_error = ENOMEM;
 			return -1;
-
+                        
 		}
 		ZERO_STRUCTP(dir->dir_list);
-
+                
 		dir->dir_end = dir->dir_next = dir->dir_list;
 	}
 	else {
-
+                
 		dir->dir_end->next = SMB_MALLOC_P(struct smbc_dir_list);
-		
+                
 		if (!dir->dir_end->next) {
-			
+                        
 			SAFE_FREE(dirent);
 			dir->dir_error = ENOMEM;
 			return -1;
-
+                        
 		}
 		ZERO_STRUCTP(dir->dir_end->next);
-
+                
 		dir->dir_end = dir->dir_end->next;
 	}
-
+        
 	dir->dir_end->next = NULL;
 	dir->dir_end->dirent = dirent;
-	
+        
 	dirent->smbc_type = type;
 	dirent->namelen = name_length;
 	dirent->commentlen = comment_len;
 	dirent->dirlen = size;
-  
+        
         /*
          * dirent->namelen + 1 includes the null (no null termination needed)
          * Ditto for dirent->commentlen.
@@ -126,9 +126,9 @@ add_dirent(SMBCFILE *dir,
 	strncpy(dirent->name, (name?name:""), dirent->namelen + 1);
 	dirent->comment = (char *)(&dirent->name + dirent->namelen + 1);
 	strncpy(dirent->comment, (comment?comment:""), dirent->commentlen + 1);
-	
+        
 	return 0;
-
+        
 }
 
 static void
@@ -142,18 +142,18 @@ list_unique_wg_fn(const char *name,
         struct smbc_dirent *dirent;
 	int dirent_type;
         int do_remove = 0;
-
+        
 	dirent_type = dir->dir_type;
-
+        
 	if (add_dirent(dir, name, comment, dirent_type) < 0) {
-
+                
 		/* An error occurred, what do we do? */
 		/* FIXME: Add some code here */
 	}
-
+        
         /* Point to the one just added */
         dirent = dir->dir_end->dirent;
-
+        
         /* See if this was a duplicate */
         for (dir_list = dir->dir_list;
              dir_list != dir->dir_end;
@@ -163,7 +163,7 @@ list_unique_wg_fn(const char *name,
                         /* Duplicate.  End end of list need to be removed. */
                         do_remove = 1;
                 }
-
+                
                 if (do_remove && dir_list->next == dir->dir_end) {
                         /* Found the end of the list.  Remove it. */
                         dir->dir_end = dir_list;
@@ -183,7 +183,7 @@ list_fn(const char *name,
 {
 	SMBCFILE *dir = (SMBCFILE *)state;
 	int dirent_type;
-
+        
 	/*
          * We need to process the type a little ...
          *
@@ -195,27 +195,27 @@ list_fn(const char *name,
          * administrative shares:
          * ADMIN$, IPC$, C$, D$, E$ ...  are type |= 0x80000000
          */
-
+        
 	if (dir->dir_type == SMBC_FILE_SHARE) {
 		switch (type) {
                 case 0 | 0x80000000:
 		case 0:
 			dirent_type = SMBC_FILE_SHARE;
 			break;
-
+                        
 		case 1:
 			dirent_type = SMBC_PRINTER_SHARE;
 			break;
-
+                        
 		case 2:
 			dirent_type = SMBC_COMMS_SHARE;
 			break;
-
+                        
                 case 3 | 0x80000000:
 		case 3:
 			dirent_type = SMBC_IPC_SHARE;
 			break;
-
+                        
 		default:
 			dirent_type = SMBC_FILE_SHARE; /* FIXME, error? */
 			break;
@@ -224,12 +224,12 @@ list_fn(const char *name,
 	else {
                 dirent_type = dir->dir_type;
         }
-
+        
 	if (add_dirent(dir, name, comment, dirent_type) < 0) {
-
+                
 		/* An error occurred, what do we do? */
 		/* FIXME: Add some code here */
-
+                
 	}
 }
 
@@ -239,16 +239,16 @@ dir_list_fn(const char *mnt,
             const char *mask,
             void *state)
 {
-
+        
 	if (add_dirent((SMBCFILE *)state, finfo->name, "", 
 		       (finfo->mode&aDIR?SMBC_DIR:SMBC_FILE)) < 0) {
-
+                
 		/* Handle an error ... */
-
+                
 		/* FIXME: Add some code ... */
-
+                
 	} 
-
+        
 }
 
 static int
@@ -270,14 +270,14 @@ net_share_enum_rpc(struct cli_state *cli,
         fstring comment = "";
 	struct rpc_pipe_client *pipe_hnd;
         NTSTATUS nt_status;
-
+        
         /* Open the server service pipe */
         pipe_hnd = cli_rpc_pipe_open_noauth(cli, PI_SRVSVC, &nt_status);
         if (!pipe_hnd) {
                 DEBUG(1, ("net_share_enum_rpc pipe open fail!\n"));
                 return -1;
         }
-
+        
         /* Issue the NetShareEnum RPC call and retrieve the response */
 	init_enum_hnd(&enum_hnd, 0);
 	result = rpccli_srvsvc_net_share_enum(pipe_hnd,
@@ -286,35 +286,35 @@ net_share_enum_rpc(struct cli_state *cli,
                                               &ctr,
                                               preferred_len,
                                               &enum_hnd);
-
+        
         /* Was it successful? */
 	if (!W_ERROR_IS_OK(result) || ctr.num_entries == 0) {
                 /*  Nope.  Go clean up. */
 		goto done;
         }
-
+        
         /* For each returned entry... */
         for (i = 0; i < ctr.num_entries; i++) {
-
+                
                 /* pull out the share name */
                 rpcstr_pull_unistr2_fstring(
                         name, &ctr.share.info1[i].info_1_str.uni_netname);
-
+                
                 /* pull out the share's comment */
                 rpcstr_pull_unistr2_fstring(
                         comment, &ctr.share.info1[i].info_1_str.uni_remark);
-
+                
                 /* Get the type value */
                 type = ctr.share.info1[i].info_1.type;
-
+                
                 /* Add this share to the list */
                 (*fn)(name, type, comment, state);
         }
-
+        
 done:
         /* Close the server service pipe */
         cli_rpc_pipe_close(pipe_hnd);
-
+        
         /* Tell 'em if it worked */
         return W_ERROR_IS_OK(result) ? 0 : -1;
 }
@@ -332,10 +332,10 @@ SMBC_check_options(char *server,
         DEBUG(4, ("SMBC_check_options(): server='%s' share='%s' "
                   "path='%s' options='%s'\n",
                   server, share, path, options));
-
+        
         /* No options at all is always ok */
         if (! *options) return 0;
-
+        
         /* Currently, we don't support any options. */
         return -1;
 }
@@ -346,7 +346,11 @@ SMBC_opendir_ctx(SMBCCTX *context,
                  const char *fname)
 {
         int saved_errno;
-	char *server = NULL, *share = NULL, *user = NULL, *password = NULL, *options = NULL;
+	char *server = NULL;
+        char *share = NULL;
+        char *user = NULL;
+        char *password = NULL;
+        char *options = NULL;
 	char *workgroup = NULL;
 	char *path = NULL;
         uint16 mode;
@@ -355,42 +359,42 @@ SMBC_opendir_ctx(SMBCCTX *context,
 	SMBCFILE *dir = NULL;
 	struct sockaddr_storage rem_ss;
 	TALLOC_CTX *frame = talloc_stackframe();
-
+        
 	if (!context || !context->internal->initialized) {
 	        DEBUG(4, ("no valid context\n"));
 		errno = EINVAL + 8192;
 		TALLOC_FREE(frame);
 		return NULL;
-
+                
 	}
-
+        
 	if (!fname) {
 		DEBUG(4, ("no valid fname\n"));
 		errno = EINVAL + 8193;
 		TALLOC_FREE(frame);
 		return NULL;
 	}
-
+        
 	if (SMBC_parse_path(frame,
-				context,
-				fname,
-				&workgroup,
-				&server,
-				&share,
-				&path,
-				&user,
-				&password,
-				&options)) {
+                            context,
+                            fname,
+                            &workgroup,
+                            &server,
+                            &share,
+                            &path,
+                            &user,
+                            &password,
+                            &options)) {
 	        DEBUG(4, ("no valid path\n"));
 		errno = EINVAL + 8194;
 		TALLOC_FREE(frame);
 		return NULL;
 	}
-
+        
 	DEBUG(4, ("parsed path: fname='%s' server='%s' share='%s' "
                   "path='%s' options='%s'\n",
                   fname, server, share, path, options));
-
+        
         /* Ensure the options are valid */
         if (SMBC_check_options(server, share, path, options)) {
                 DEBUG(4, ("unacceptable options (%s)\n", options));
@@ -398,7 +402,7 @@ SMBC_opendir_ctx(SMBCCTX *context,
 		TALLOC_FREE(frame);
                 return NULL;
         }
-
+        
 	if (!user || user[0] == (char)0) {
 		user = talloc_strdup(frame, context->config.user);
 		if (!user) {
@@ -407,35 +411,35 @@ SMBC_opendir_ctx(SMBCCTX *context,
 			return NULL;
 		}
 	}
-
+        
 	dir = SMB_MALLOC_P(SMBCFILE);
-
+        
 	if (!dir) {
 		errno = ENOMEM;
 		TALLOC_FREE(frame);
 		return NULL;
 	}
-
+        
 	ZERO_STRUCTP(dir);
-
+        
 	dir->cli_fd   = 0;
 	dir->fname    = SMB_STRDUP(fname);
 	dir->srv      = NULL;
 	dir->offset   = 0;
 	dir->file     = False;
 	dir->dir_list = dir->dir_next = dir->dir_end = NULL;
-
+        
 	if (server[0] == (char)0) {
-
+                
                 int i;
                 int count;
                 int max_lmb_count;
                 struct ip_service *ip_list;
                 struct ip_service server_addr;
                 struct user_auth_info u_info;
-
+                
 		if (share[0] != (char)0 || path[0] != (char)0) {
-
+                        
 			errno = EINVAL + 8196;
 			if (dir) {
 				SAFE_FREE(dir->fname);
@@ -444,12 +448,12 @@ SMBC_opendir_ctx(SMBCCTX *context,
 			TALLOC_FREE(frame);
 			return NULL;
 		}
-
+                
                 /* Determine how many local master browsers to query */
-                max_lmb_count = (context->internal->browse_max_lmb_count == 0
+                max_lmb_count = (context->options.browse_max_lmb_count == 0
                                  ? INT_MAX
-                                 : context->internal->browse_max_lmb_count);
-
+                                 : context->options.browse_max_lmb_count);
+                
 		memset(&u_info, '\0', sizeof(u_info));
 		u_info.username = talloc_strdup(frame,user);
 		u_info.password = talloc_strdup(frame,password);
@@ -461,7 +465,7 @@ SMBC_opendir_ctx(SMBCCTX *context,
 			TALLOC_FREE(frame);
 			return NULL;
 		}
-
+                
 		/*
                  * We have server and share and path empty but options
                  * requesting that we scan all master browsers for their list
@@ -470,16 +474,16 @@ SMBC_opendir_ctx(SMBCCTX *context,
                  * doesn't work, then try our other methods which return only
                  * a single master browser.
                  */
-
+                
                 ip_list = NULL;
                 if (!NT_STATUS_IS_OK(name_resolve_bcast(MSBROWSE, 1, &ip_list,
-				     &count)))
+                                                        &count)))
 		{
-
+                        
                         SAFE_FREE(ip_list);
-
+                        
                         if (!find_master_ip(workgroup, &server_addr.ss)) {
-
+                                
 				if (dir) {
 					SAFE_FREE(dir->fname);
 					SAFE_FREE(dir);
@@ -488,7 +492,7 @@ SMBC_opendir_ctx(SMBCCTX *context,
 				TALLOC_FREE(frame);
                                 return NULL;
                         }
-
+                        
 			ip_list = (struct ip_service *)memdup(
 				&server_addr, sizeof(server_addr));
 			if (ip_list == NULL) {
@@ -498,17 +502,17 @@ SMBC_opendir_ctx(SMBCCTX *context,
 			}
                         count = 1;
                 }
-
+                
                 for (i = 0; i < count && i < max_lmb_count; i++) {
 			char addr[INET6_ADDRSTRLEN];
 			char *wg_ptr = NULL;
                 	struct cli_state *cli = NULL;
-
+                        
 			print_sockaddr(addr, sizeof(addr), &ip_list[i].ss);
                         DEBUG(99, ("Found master browser %d of %d: %s\n",
                                    i+1, MAX(count, max_lmb_count),
                                    addr));
-
+                        
                         cli = get_ipc_connect_master_ip(talloc_tos(),
 							&ip_list[i],
                                                         &u_info,
@@ -518,39 +522,39 @@ SMBC_opendir_ctx(SMBCCTX *context,
 			if (!cli) {
 				continue;
 			}
-
+                        
 			workgroup = talloc_strdup(frame, wg_ptr);
 			server = talloc_strdup(frame, cli->desthost);
-
+                        
                         cli_shutdown(cli);
-
+                        
 			if (!workgroup || !server) {
 				errno = ENOMEM;
 				TALLOC_FREE(frame);
 				return NULL;
 			}
-
+                        
                         DEBUG(4, ("using workgroup %s %s\n",
                                   workgroup, server));
-
+                        
                         /*
                          * For each returned master browser IP address, get a
                          * connection to IPC$ on the server if we do not
                          * already have one, and determine the
                          * workgroups/domains that it knows about.
                          */
-
+                        
                         srv = SMBC_server(frame, context, True, server, "IPC$",
                                           &workgroup, &user, &password);
                         if (!srv) {
                                 continue;
                         }
-
+                        
                         dir->srv = srv;
                         dir->dir_type = SMBC_WORKGROUP;
-
+                        
                         /* Now, list the stuff ... */
-
+                        
                         if (!cli_NetServerEnum(srv->cli,
                                                workgroup,
                                                SV_TYPE_DOMAIN_ENUM,
@@ -559,7 +563,7 @@ SMBC_opendir_ctx(SMBCCTX *context,
                                 continue;
                         }
                 }
-
+                
                 SAFE_FREE(ip_list);
         } else {
                 /*
@@ -568,7 +572,7 @@ SMBC_opendir_ctx(SMBCCTX *context,
                  */
 		if (*share == '\0') {
 			if (*path != '\0') {
-
+                                
                                 /* Should not have empty share with path */
 				errno = EINVAL + 8197;
 				if (dir) {
@@ -577,9 +581,9 @@ SMBC_opendir_ctx(SMBCCTX *context,
 				}
 				TALLOC_FREE(frame);
 				return NULL;
-
+                                
 			}
-
+                        
 			/*
                          * We don't know if <server> is really a server name
                          * or is a workgroup/domain name.  If we already have
@@ -588,15 +592,16 @@ SMBC_opendir_ctx(SMBCCTX *context,
                          * <server><1B>, or <server><20> translates.  We check
                          * to see if <server> is an IP address first.
                          */
-
+                        
                         /*
                          * See if we have an existing server.  Do not
                          * establish a connection if one does not already
                          * exist.
                          */
-                        srv = SMBC_server(frame, context, False, server, "IPC$",
+                        srv = SMBC_server(frame, context, False,
+                                          server, "IPC$",
                                           &workgroup, &user, &password);
-
+                        
                         /*
                          * If no existing server and not an IP addr, look for
                          * LMB or DMB
@@ -605,20 +610,20 @@ SMBC_opendir_ctx(SMBCCTX *context,
                             !is_ipaddress(server) &&
 			    (resolve_name(server, &rem_ss, 0x1d) ||   /* LMB */
                              resolve_name(server, &rem_ss, 0x1b) )) { /* DMB */
-
+                                
 				fstring buserver;
-
+                                
 				dir->dir_type = SMBC_SERVER;
-
+                                
 				/*
 				 * Get the backup list ...
 				 */
 				if (!name_status_find(server, 0, 0,
                                                       &rem_ss, buserver)) {
-
-                                        DEBUG(0, ("Could not get name of "
-                                                  "local/domain master browser "
-                                                  "for server %s\n", server));
+                                        
+                                        DEBUG(0,("Could not get name of "
+                                                 "local/domain master browser "
+                                                 "for server %s\n", server));
 					if (dir) {
 						SAFE_FREE(dir->fname);
 						SAFE_FREE(dir);
@@ -626,16 +631,17 @@ SMBC_opendir_ctx(SMBCCTX *context,
 					errno = EPERM;
 					TALLOC_FREE(frame);
 					return NULL;
-
+                                        
 				}
-
+                                
 				/*
                                  * Get a connection to IPC$ on the server if
                                  * we do not already have one
                                  */
 				srv = SMBC_server(frame, context, True,
                                                   buserver, "IPC$",
-                                                  &workgroup, &user, &password);
+                                                  &workgroup,
+                                                  &user, &password);
 				if (!srv) {
 				        DEBUG(0, ("got no contact to IPC$\n"));
 					if (dir) {
@@ -644,16 +650,16 @@ SMBC_opendir_ctx(SMBCCTX *context,
 					}
 					TALLOC_FREE(frame);
 					return NULL;
-
+                                        
 				}
-
+                                
 				dir->srv = srv;
-
+                                
 				/* Now, list the servers ... */
 				if (!cli_NetServerEnum(srv->cli, server,
                                                        0x0000FFFE, list_fn,
 						       (void *)dir)) {
-
+                                        
 					if (dir) {
 						SAFE_FREE(dir->fname);
 						SAFE_FREE(dir);
@@ -663,15 +669,17 @@ SMBC_opendir_ctx(SMBCCTX *context,
 				}
 			} else if (srv ||
                                    (resolve_name(server, &rem_ss, 0x20))) {
-
-                                /* If we hadn't found the server, get one now */
+                                
+                                /*
+                                 * If we hadn't found the server, get one now
+                                 */
                                 if (!srv) {
                                         srv = SMBC_server(frame, context, True,
                                                           server, "IPC$",
                                                           &workgroup,
                                                           &user, &password);
                                 }
-
+                                
                                 if (!srv) {
                                         if (dir) {
                                                 SAFE_FREE(dir->fname);
@@ -679,14 +687,14 @@ SMBC_opendir_ctx(SMBCCTX *context,
                                         }
 					TALLOC_FREE(frame);
                                         return NULL;
-
+                                        
                                 }
-
+                                
                                 dir->dir_type = SMBC_FILE_SHARE;
                                 dir->srv = srv;
-
+                                
                                 /* List the shares ... */
-
+                                
                                 if (net_share_enum_rpc(
                                             srv->cli,
                                             list_fn,
@@ -695,7 +703,7 @@ SMBC_opendir_ctx(SMBCCTX *context,
                                             srv->cli,
                                             list_fn,
                                             (void *)dir) < 0) {
-
+                                        
                                         errno = cli_errno(srv->cli);
                                         if (dir) {
                                                 SAFE_FREE(dir->fname);
@@ -703,7 +711,7 @@ SMBC_opendir_ctx(SMBCCTX *context,
                                         }
 					TALLOC_FREE(frame);
                                         return NULL;
-
+                                        
                                 }
                         } else {
                                 /* Neither the workgroup nor server exists */
@@ -715,7 +723,7 @@ SMBC_opendir_ctx(SMBCCTX *context,
 				TALLOC_FREE(frame);
                                 return NULL;
 			}
-
+                        
 		}
 		else {
                         /*
@@ -724,13 +732,13 @@ SMBC_opendir_ctx(SMBCCTX *context,
                          */
 			char *targetpath;
 			struct cli_state *targetcli;
-
+                        
 			/* We connect to the server and list the directory */
 			dir->dir_type = SMBC_FILE_SHARE;
-
+                        
 			srv = SMBC_server(frame, context, True, server, share,
                                           &workgroup, &user, &password);
-
+                        
 			if (!srv) {
 				if (dir) {
 					SAFE_FREE(dir->fname);
@@ -739,11 +747,11 @@ SMBC_opendir_ctx(SMBCCTX *context,
 				TALLOC_FREE(frame);
 				return NULL;
 			}
-
+                        
 			dir->srv = srv;
-
+                        
 			/* Now, list the files ... */
-
+                        
                         p = path + strlen(path);
 			path = talloc_asprintf_append(path, "\\*");
 			if (!path) {
@@ -754,7 +762,7 @@ SMBC_opendir_ctx(SMBCCTX *context,
 				TALLOC_FREE(frame);
 				return NULL;
 			}
-
+                        
 			if (!cli_resolve_path(frame, "", srv->cli, path,
                                               &targetcli, &targetpath)) {
 				d_printf("Could not resolve %s\n", path);
@@ -765,47 +773,48 @@ SMBC_opendir_ctx(SMBCCTX *context,
 				TALLOC_FREE(frame);
 				return NULL;
 			}
-
+                        
 			if (cli_list(targetcli, targetpath,
                                      aDIR | aSYSTEM | aHIDDEN,
                                      dir_list_fn, (void *)dir) < 0) {
-
+                                
 				if (dir) {
 					SAFE_FREE(dir->fname);
 					SAFE_FREE(dir);
 				}
 				saved_errno = SMBC_errno(context, targetcli);
-
+                                
                                 if (saved_errno == EINVAL) {
-                                    /*
-                                     * See if they asked to opendir something
-                                     * other than a directory.  If so, the
-                                     * converted error value we got would have
-                                     * been EINVAL rather than ENOTDIR.
-                                     */
-                                    *p = '\0'; /* restore original path */
-
-                                    if (SMBC_getatr(context, srv, path,
-                                                    &mode, NULL,
-                                                    NULL, NULL, NULL, NULL,
-                                                    NULL) &&
-                                        ! IS_DOS_DIR(mode)) {
-
-                                        /* It is.  Correct the error value */
-                                        saved_errno = ENOTDIR;
-                                    }
+                                        /*
+                                         * See if they asked to opendir
+                                         * something other than a directory.
+                                         * If so, the converted error value we
+                                         * got would have been EINVAL rather
+                                         * than ENOTDIR.
+                                         */
+                                        *p = '\0'; /* restore original path */
+                                        
+                                        if (SMBC_getatr(context, srv, path,
+                                                        &mode, NULL,
+                                                        NULL, NULL, NULL, NULL,
+                                                        NULL) &&
+                                            ! IS_DOS_DIR(mode)) {
+                                                
+                                                /* It is.  Correct the error value */
+                                                saved_errno = ENOTDIR;
+                                        }
                                 }
-
+                                
                                 /*
                                  * If there was an error and the server is no
                                  * good any more...
                                  */
                                 if (cli_is_error(targetcli) &&
                                     (context->server.check_server_fn)(context, srv)) {
-
+                                        
                                         /* ... then remove it. */
                                         if ((context->server.remove_unused_server_fn)(context,
-                                                                          srv)) { 
+                                                                                      srv)) { 
                                                 /*
                                                  * We could not remove the
                                                  * server completely, remove
@@ -817,19 +826,19 @@ SMBC_opendir_ctx(SMBCCTX *context,
                                                 (context->cache.remove_cached_server_fn)(context, srv);
                                         }
                                 }
-
+                                
                                 errno = saved_errno;
 				TALLOC_FREE(frame);
 				return NULL;
 			}
 		}
-
+                
 	}
-
+        
 	DLIST_ADD(context->internal->files, dir);
 	TALLOC_FREE(frame);
 	return dir;
-
+        
 }
 
 /*
@@ -841,32 +850,32 @@ SMBC_closedir_ctx(SMBCCTX *context,
                   SMBCFILE *dir)
 {
 	TALLOC_CTX *frame = talloc_stackframe();
-
+        
 	if (!context || !context->internal->initialized) {
 		errno = EINVAL;
 		TALLOC_FREE(frame);
 		return -1;
 	}
-
+        
 	if (!dir || !SMBC_dlist_contains(context->internal->files, dir)) {
 		errno = EBADF;
 		TALLOC_FREE(frame);
 		return -1;
 	}
-
+        
 	remove_dir(dir); /* Clean it up */
-
+        
 	DLIST_REMOVE(context->internal->files, dir);
-
+        
 	if (dir) {
-
+                
 		SAFE_FREE(dir->fname);
 		SAFE_FREE(dir);    /* Free the space too */
 	}
-
+        
 	TALLOC_FREE(frame);
 	return 0;
-
+        
 }
 
 static void
@@ -875,29 +884,29 @@ smbc_readdir_internal(SMBCCTX * context,
                       struct smbc_dirent *src,
                       int max_namebuf_len)
 {
-        if (context->internal->urlencode_readdir_entries) {
-
+        if (context->options.urlencode_readdir_entries) {
+                
                 /* url-encode the name.  get back remaining buffer space */
                 max_namebuf_len =
                         SMBC_urlencode(dest->name, src->name, max_namebuf_len);
-
+                
                 /* We now know the name length */
                 dest->namelen = strlen(dest->name);
-
+                
                 /* Save the pointer to the beginning of the comment */
                 dest->comment = dest->name + dest->namelen + 1;
-
+                
                 /* Copy the comment */
                 strncpy(dest->comment, src->comment, max_namebuf_len - 1);
                 dest->comment[max_namebuf_len - 1] = '\0';
-
+                
                 /* Save other fields */
                 dest->smbc_type = src->smbc_type;
                 dest->commentlen = strlen(dest->comment);
                 dest->dirlen = ((dest->comment + dest->commentlen + 1) -
                                 (char *) dest);
         } else {
-
+                
                 /* No encoding.  Just copy the entry as is. */
                 memcpy(dest, src, src->dirlen);
                 dest->comment = (char *)(&dest->name + src->namelen + 1);
@@ -916,58 +925,58 @@ SMBC_readdir_ctx(SMBCCTX *context,
         int maxlen;
 	struct smbc_dirent *dirp, *dirent;
 	TALLOC_CTX *frame = talloc_stackframe();
-
+        
 	/* Check that all is ok first ... */
-
+        
 	if (!context || !context->internal->initialized) {
-
+                
 		errno = EINVAL;
                 DEBUG(0, ("Invalid context in SMBC_readdir_ctx()\n"));
 		TALLOC_FREE(frame);
 		return NULL;
-
+                
 	}
-
+        
 	if (!dir || !SMBC_dlist_contains(context->internal->files, dir)) {
-
+                
 		errno = EBADF;
                 DEBUG(0, ("Invalid dir in SMBC_readdir_ctx()\n"));
 		TALLOC_FREE(frame);
 		return NULL;
-
+                
 	}
-
+        
 	if (dir->file != False) { /* FIXME, should be dir, perhaps */
-
+                
 		errno = ENOTDIR;
                 DEBUG(0, ("Found file vs directory in SMBC_readdir_ctx()\n"));
 		TALLOC_FREE(frame);
 		return NULL;
-
+                
 	}
-
+        
 	if (!dir->dir_next) {
 		TALLOC_FREE(frame);
 		return NULL;
         }
-
+        
         dirent = dir->dir_next->dirent;
         if (!dirent) {
-
+                
                 errno = ENOENT;
 		TALLOC_FREE(frame);
                 return NULL;
-
+                
         }
-
+        
         dirp = (struct smbc_dirent *)context->internal->dirent;
         maxlen = (sizeof(context->internal->dirent) -
                   sizeof(struct smbc_dirent));
-
+        
         smbc_readdir_internal(context, dirp, dirent, maxlen);
-
+        
         dir->dir_next = dir->dir_next->next;
-
+        
 	TALLOC_FREE(frame);
         return dirp;
 }
@@ -988,98 +997,99 @@ SMBC_getdents_ctx(SMBCCTX *context,
 	char *ndir = (char *)dirp;
 	struct smbc_dir_list *dirlist;
 	TALLOC_CTX *frame = talloc_stackframe();
-
+        
 	/* Check that all is ok first ... */
-
+        
 	if (!context || !context->internal->initialized) {
-
+                
 		errno = EINVAL;
 		TALLOC_FREE(frame);
 		return -1;
-
+                
 	}
-
+        
 	if (!dir || !SMBC_dlist_contains(context->internal->files, dir)) {
-
+                
 		errno = EBADF;
 		TALLOC_FREE(frame);
 		return -1;
-    
+                
 	}
-
+        
 	if (dir->file != False) { /* FIXME, should be dir, perhaps */
-
+                
 		errno = ENOTDIR;
 		TALLOC_FREE(frame);
 		return -1;
-
+                
 	}
-
+        
 	/* 
 	 * Now, retrieve the number of entries that will fit in what was passed
 	 * We have to figure out if the info is in the list, or we need to 
 	 * send a request to the server to get the info.
 	 */
-
+        
 	while ((dirlist = dir->dir_next)) {
 		struct smbc_dirent *dirent;
-
+                
 		if (!dirlist->dirent) {
-
+                        
 			errno = ENOENT;  /* Bad error */
 			TALLOC_FREE(frame);
 			return -1;
-
+                        
 		}
-
+                
                 /* Do urlencoding of next entry, if so selected */
                 dirent = (struct smbc_dirent *)context->internal->dirent;
                 maxlen = (sizeof(context->internal->dirent) -
                           sizeof(struct smbc_dirent));
-                smbc_readdir_internal(context, dirent, dirlist->dirent, maxlen);
-
+                smbc_readdir_internal(context, dirent,
+                                      dirlist->dirent, maxlen);
+                
                 reqd = dirent->dirlen;
-
+                
 		if (rem < reqd) {
-
+                        
 			if (rem < count) { /* We managed to copy something */
-
+                                
 				errno = 0;
 				TALLOC_FREE(frame);
 				return count - rem;
-
+                                
 			}
 			else { /* Nothing copied ... */
-
+                                
 				errno = EINVAL;  /* Not enough space ... */
 				TALLOC_FREE(frame);
 				return -1;
-
+                                
 			}
-
+                        
 		}
-
+                
 		memcpy(ndir, dirent, reqd); /* Copy the data in ... */
-    
+                
 		((struct smbc_dirent *)ndir)->comment = 
 			(char *)(&((struct smbc_dirent *)ndir)->name +
                                  dirent->namelen +
                                  1);
-
+                
 		ndir += reqd;
-
+                
 		rem -= reqd;
-
+                
 		dir->dir_next = dirlist = dirlist -> next;
 	}
-
+        
 	TALLOC_FREE(frame);
-
+        
 	if (rem == count)
 		return 0;
 	else
 		return count - rem;
-
+        
 }
 
 /*
@@ -1101,36 +1111,36 @@ SMBC_mkdir_ctx(SMBCCTX *context,
 	char *targetpath = NULL;
 	struct cli_state *targetcli = NULL;
 	TALLOC_CTX *frame = talloc_stackframe();
-
+        
 	if (!context || !context->internal->initialized) {
 		errno = EINVAL;
 		TALLOC_FREE(frame);
 		return -1;
 	}
-
+        
 	if (!fname) {
 		errno = EINVAL;
 		TALLOC_FREE(frame);
 		return -1;
 	}
-
+        
 	DEBUG(4, ("smbc_mkdir(%s)\n", fname));
-
+        
 	if (SMBC_parse_path(frame,
-				context,
-				fname,
-				&workgroup,
-				&server,
-				&share,
-				&path,
-				&user,
-				&password,
-				NULL)) {
+                            context,
+                            fname,
+                            &workgroup,
+                            &server,
+                            &share,
+                            &path,
+                            &user,
+                            &password,
+                            NULL)) {
                 errno = EINVAL;
 		TALLOC_FREE(frame);
 		return -1;
         }
-
+        
 	if (!user || user[0] == (char)0) {
 		user = talloc_strdup(frame, context->config.user);
 		if (!user) {
@@ -1139,37 +1149,37 @@ SMBC_mkdir_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 */
-
+                
 	}
-
+        
 	/*d_printf(">>>mkdir: resolving %s\n", path);*/
 	if (!cli_resolve_path(frame, "", srv->cli, path,
-				&targetcli, &targetpath)) {
+                              &targetcli, &targetpath)) {
 		d_printf("Could not resolve %s\n", path);
 		TALLOC_FREE(frame);
 		return -1;
 	}
 	/*d_printf(">>>mkdir: resolved path as %s\n", targetpath);*/
-
+        
 	if (!cli_mkdir(targetcli, targetpath)) {
-
+                
 		errno = SMBC_errno(context, targetcli);
 		TALLOC_FREE(frame);
 		return -1;
-
+                
 	} 
-
+        
 	TALLOC_FREE(frame);
 	return 0;
-
+        
 }
 
 /*
@@ -1208,36 +1218,36 @@ SMBC_rmdir_ctx(SMBCCTX *context,
         char *targetpath = NULL;
 	struct cli_state *targetcli = NULL;
 	TALLOC_CTX *frame = talloc_stackframe();
-
+        
 	if (!context || !context->internal->initialized) {
 		errno = EINVAL;
 		TALLOC_FREE(frame);
 		return -1;
 	}
-
+        
 	if (!fname) {
 		errno = EINVAL;
 		TALLOC_FREE(frame);
 		return -1;
 	}
-
+        
 	DEBUG(4, ("smbc_rmdir(%s)\n", fname));
-
+        
 	if (SMBC_parse_path(frame,
-				context,
-				fname,
-				&workgroup,
-				&server,
-				&share,
-				&path,
-				&user,
-				&password,
-				NULL)) {
+                            context,
+                            fname,
+                            &workgroup,
+                            &server,
+                            &share,
+                            &path,
+                            &user,
+                            &password,
+                            NULL)) {
                 errno = EINVAL;
 		TALLOC_FREE(frame);
 		return -1;
         }
-
+        
 	if (!user || user[0] == (char)0) {
 		user = talloc_strdup(frame, context->config.user);
 		if (!user) {
@@ -1246,38 +1256,38 @@ SMBC_rmdir_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 */
-
+                
 	}
-
+        
 	/*d_printf(">>>rmdir: resolving %s\n", path);*/
 	if (!cli_resolve_path(frame, "", srv->cli, path,
-				&targetcli, &targetpath)) {
+                              &targetcli, &targetpath)) {
 		d_printf("Could not resolve %s\n", path);
 		TALLOC_FREE(frame);
 		return -1;
 	}
 	/*d_printf(">>>rmdir: resolved path as %s\n", targetpath);*/
-
-
+        
+        
 	if (!cli_rmdir(targetcli, targetpath)) {
-
+                
 		errno = SMBC_errno(context, targetcli);
-
+                
 		if (errno == EACCES) {  /* Check if the dir empty or not */
-
+                        
                         /* Local storage to avoid buffer overflows */
 			char *lpath;
-
+                        
 			smbc_rmdir_dirempty = True;  /* Make this so ... */
-
+                        
 			lpath = talloc_asprintf(frame, "%s\\*",
 						targetpath);
 			if (!lpath) {
@@ -1285,34 +1295,34 @@ SMBC_rmdir_ctx(SMBCCTX *context,
 				TALLOC_FREE(frame);
 				return -1;
 			}
-
+                        
 			if (cli_list(targetcli, lpath,
                                      aDIR | aSYSTEM | aHIDDEN,
                                      rmdir_list_fn, NULL) < 0) {
-
+                                
 				/* Fix errno to ignore latest error ... */
 				DEBUG(5, ("smbc_rmdir: "
                                           "cli_list returned an error: %d\n",
 					  SMBC_errno(context, targetcli)));
 				errno = EACCES;
-
+                                
 			}
-
+                        
 			if (smbc_rmdir_dirempty)
 				errno = EACCES;
 			else
 				errno = ENOTEMPTY;
-
+                        
 		}
-
+                
 		TALLOC_FREE(frame);
 		return -1;
-
+                
 	} 
-
+        
 	TALLOC_FREE(frame);
 	return 0;
-
+        
 }
 
 /*
@@ -1324,38 +1334,38 @@ SMBC_telldir_ctx(SMBCCTX *context,
                  SMBCFILE *dir)
 {
 	TALLOC_CTX *frame = talloc_stackframe();
-
+        
 	if (!context || !context->internal->initialized) {
-
+                
 		errno = EINVAL;
 		TALLOC_FREE(frame);
 		return -1;
-
+                
 	}
-
+        
 	if (!dir || !SMBC_dlist_contains(context->internal->files, dir)) {
-
+                
 		errno = EBADF;
 		TALLOC_FREE(frame);
 		return -1;
-
+                
 	}
-
+        
 	if (dir->file != False) { /* FIXME, should be dir, perhaps */
-
+                
 		errno = ENOTDIR;
 		TALLOC_FREE(frame);
 		return -1;
-
+                
 	}
-
+        
         /* See if we're already at the end. */
         if (dir->dir_next == NULL) {
                 /* We are. */
 		TALLOC_FREE(frame);
                 return -1;
         }
-
+        
 	/*
 	 * We return the pointer here as the offset
 	 */
@@ -1369,28 +1379,28 @@ SMBC_telldir_ctx(SMBCCTX *context,
 
 static struct smbc_dir_list *
 check_dir_ent(struct smbc_dir_list *list, 
-                   struct smbc_dirent *dirent)
+              struct smbc_dirent *dirent)
 {
-
+        
 	/* Run down the list looking for what we want */
-
+        
 	if (dirent) {
-
+                
 		struct smbc_dir_list *tmp = list;
-
+                
 		while (tmp) {
-
+                        
 			if (tmp->dirent == dirent)
 				return tmp;
-
+                        
 			tmp = tmp->next;
-
+                        
 		}
-
+                
 	}
-
+        
 	return NULL;  /* Not found, or an error */
-
+        
 }
 
 
@@ -1407,50 +1417,50 @@ SMBC_lseekdir_ctx(SMBCCTX *context,
 	struct smbc_dirent *dirent = (struct smbc_dirent *)l_offset;
 	struct smbc_dir_list *list_ent = (struct smbc_dir_list *)NULL;
 	TALLOC_CTX *frame = talloc_stackframe();
-
+        
 	if (!context || !context->internal->initialized) {
-
+                
 		errno = EINVAL;
 		TALLOC_FREE(frame);
 		return -1;
-
+                
 	}
-
+        
 	if (dir->file != False) { /* FIXME, should be dir, perhaps */
-
+                
 		errno = ENOTDIR;
 		TALLOC_FREE(frame);
 		return -1;
-
+                
 	}
-
+        
 	/* Now, check what we were passed and see if it is OK ... */
-
+        
 	if (dirent == NULL) {  /* Seek to the begining of the list */
-
+                
 		dir->dir_next = dir->dir_list;
 		TALLOC_FREE(frame);
 		return 0;
-
+                
 	}
-
+        
         if (offset == -1) {     /* Seek to the end of the list */
                 dir->dir_next = NULL;
 		TALLOC_FREE(frame);
                 return 0;
         }
-
+        
 	/* Now, run down the list and make sure that the entry is OK       */
 	/* This may need to be changed if we change the format of the list */
-
+        
 	if ((list_ent = check_dir_ent(dir->dir_list, dirent)) == NULL) {
 		errno = EINVAL;   /* Bad entry */
 		TALLOC_FREE(frame);
 		return -1;
 	}
-
+        
 	dir->dir_next = list_ent;
-
+        
 	TALLOC_FREE(frame);
 	return 0;
 }
@@ -1464,13 +1474,13 @@ SMBC_fstatdir_ctx(SMBCCTX *context,
                   SMBCFILE *dir,
                   struct stat *st)
 {
-
+        
 	if (!context || !context->internal->initialized) {
-
+                
 		errno = EINVAL;
 		return -1;
 	}
-
+        
 	/* No code yet ... */
 	return 0;
 }
@@ -1489,37 +1499,37 @@ SMBC_chmod_ctx(SMBCCTX *context,
 	char *path = NULL;
 	uint16 mode;
 	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_chmod(%s, 0%3o)\n", fname, newmode));
-
+        
 	if (SMBC_parse_path(frame,
-				context,
-				fname,
-				&workgroup,
-				&server,
-				&share,
-				&path,
-				&user,
-				&password,
-				NULL)) {
+                            context,
+                            fname,
+                            &workgroup,
+                            &server,
+                            &share,
+                            &path,
+                            &user,
+                            &password,
+                            NULL)) {
                 errno = EINVAL;
 		TALLOC_FREE(frame);
 		return -1;
         }
-
+        
 	if (!user || user[0] == (char)0) {
 		user = talloc_strdup(frame, context->config.user);
 		if (!user) {
@@ -1528,28 +1538,28 @@ SMBC_chmod_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 */
 	}
-
+        
 	mode = 0;
-
+        
 	if (!(newmode & (S_IWUSR | S_IWGRP | S_IWOTH))) mode |= aRONLY;
 	if ((newmode & S_IXUSR) && lp_map_archive(-1)) mode |= aARCH;
 	if ((newmode & S_IXGRP) && lp_map_system(-1)) mode |= aSYSTEM;
 	if ((newmode & S_IXOTH) && lp_map_hidden(-1)) mode |= aHIDDEN;
-
+        
 	if (!cli_setatr(srv->cli, path, mode, 0)) {
 		errno = SMBC_errno(context, srv->cli);
 		TALLOC_FREE(frame);
 		return -1;
 	}
-
+        
 	TALLOC_FREE(frame);
         return 0;
 }
@@ -1569,63 +1579,63 @@ SMBC_utimes_ctx(SMBCCTX *context,
         time_t access_time;
         time_t write_time;
 	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;
 	}
-
+        
         if (tbuf == NULL) {
                 access_time = write_time = time(NULL);
         } else {
                 access_time = tbuf[0].tv_sec;
                 write_time = tbuf[1].tv_sec;
         }
-
+        
         if (DEBUGLVL(4)) {
                 char *p;
                 char atimebuf[32];
                 char mtimebuf[32];
-
+                
                 strncpy(atimebuf, ctime(&access_time), sizeof(atimebuf) - 1);
                 atimebuf[sizeof(atimebuf) - 1] = '\0';
                 if ((p = strchr(atimebuf, '\n')) != NULL) {
                         *p = '\0';
                 }
-
+                
                 strncpy(mtimebuf, ctime(&write_time), sizeof(mtimebuf) - 1);
                 mtimebuf[sizeof(mtimebuf) - 1] = '\0';
                 if ((p = strchr(mtimebuf, '\n')) != NULL) {
                         *p = '\0';
                 }
-
+                
                 dbgtext("smbc_utimes(%s, atime = %s mtime = %s)\n",
                         fname, atimebuf, mtimebuf);
         }
-
+        
 	if (SMBC_parse_path(frame,
-				context,
-				fname,
-				&workgroup,
-				&server,
-				&share,
-				&path,
-				&user,
-				&password,
-				NULL)) {
+                            context,
+                            fname,
+                            &workgroup,
+                            &server,
+                            &share,
+                            &path,
+                            &user,
+                            &password,
+                            NULL)) {
 		errno = EINVAL;
 		TALLOC_FREE(frame);
 		return -1;
         }
-
+        
 	if (!user || user[0] == (char)0) {
 		user = talloc_strdup(frame, context->config.user);
 		if (!user) {
@@ -1634,21 +1644,21 @@ SMBC_utimes_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 (!SMBC_setatr(context, srv, path,
                          0, access_time, write_time, 0, 0)) {
 		TALLOC_FREE(frame);
                 return -1;      /* errno set by SMBC_setatr */
         }
-
+        
 	TALLOC_FREE(frame);
         return 0;
 }
@@ -1661,43 +1671,47 @@ int
 SMBC_unlink_ctx(SMBCCTX *context,
                 const char *fname)
 {
-	char *server = NULL, *share = NULL, *user = NULL, *password = NULL, *workgroup = NULL;
+	char *server = NULL;
+        char *share = NULL;
+        char *user = NULL;
+        char *password = NULL;
+        char *workgroup = NULL;
 	char *path = NULL;
 	char *targetpath = NULL;
 	struct cli_state *targetcli = NULL;
 	SMBCSRV *srv = 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;
-
+                
 	}
-
+        
 	if (SMBC_parse_path(frame,
-				context,
-				fname,
-				&workgroup,
-				&server,
-				&share,
-				&path,
-				&user,
-				&password,
-				NULL)) {
+                            context,
+                            fname,
+                            &workgroup,
+                            &server,
+                            &share,
+                            &path,
+                            &user,
+                            &password,
+                            NULL)) {
                 errno = EINVAL;
 		TALLOC_FREE(frame);
                 return -1;
         }
-
+        
 	if (!user || user[0] == (char)0) {
 		user = talloc_strdup(frame, context->config.user);
 		if (!user) {
@@ -1706,31 +1720,31 @@ SMBC_unlink_ctx(SMBCCTX *context,
 			return -1;
 		}
 	}
-
+        
 	srv = SMBC_server(frame, context, True,
                           server, share, &workgroup, &user, &password);
-
+        
 	if (!srv) {
 		TALLOC_FREE(frame);
 		return -1;  /* SMBC_server sets errno */
-
+                
 	}
-
+        
 	/*d_printf(">>>unlink: resolving %s\n", path);*/
 	if (!cli_resolve_path(frame, "", srv->cli, path,
-				&targetcli, &targetpath)) {
+                              &targetcli, &targetpath)) {
 		d_printf("Could not resolve %s\n", path);
 		TALLOC_FREE(frame);
 		return -1;
 	}
 	/*d_printf(">>>unlink: resolved path as %s\n", targetpath);*/
-
+        
 	if (!cli_unlink(targetcli, targetpath)) {
-
+                
 		errno = SMBC_errno(context, targetcli);
-
+                
 		if (errno == EACCES) { /* Check if the file is a directory */
-
+                        
 			int saverr = errno;
 			SMB_OFF_T size = 0;
 			uint16 mode = 0;
@@ -1738,39 +1752,39 @@ SMBC_unlink_ctx(SMBCCTX *context,
                         struct timespec access_time_ts;
                         struct timespec change_time_ts;
 			SMB_INO_T ino = 0;
-
+                        
 			if (!SMBC_getatr(context, srv, path, &mode, &size,
 					 NULL,
                                          &access_time_ts,
                                          &write_time_ts,
                                          &change_time_ts,
                                          &ino)) {
-
+                                
 				/* Hmmm, bad error ... What? */
-
+                                
 				errno = SMBC_errno(context, targetcli);
 				TALLOC_FREE(frame);
 				return -1;
-
+                                
 			}
 			else {
-
+                                
 				if (IS_DOS_DIR(mode))
 					errno = EISDIR;
 				else
 					errno = saverr;  /* Restore this */
-
+                                
 			}
 		}
-
+                
 		TALLOC_FREE(frame);
 		return -1;
-
+                
 	}
-
+        
 	TALLOC_FREE(frame);
 	return 0;  /* Success ... */
-
+        
 }
 
 /*
@@ -1800,39 +1814,39 @@ SMBC_rename_ctx(SMBCCTX *ocontext,
         struct cli_state *targetcli2 = NULL;
 	SMBCSRV *srv = NULL;
 	TALLOC_CTX *frame = talloc_stackframe();
-
+        
 	if (!ocontext || !ncontext ||
 	    !ocontext->internal->initialized ||
 	    !ncontext->internal->initialized) {
-            
+                
 		errno = EINVAL;  /* Best I can think of ... */
 		TALLOC_FREE(frame);
 		return -1;
 	}
-
+        
 	if (!oname || !nname) {
 		errno = EINVAL;
 		TALLOC_FREE(frame);
 		return -1;
 	}
-
+        
 	DEBUG(4, ("smbc_rename(%s,%s)\n", oname, nname));
-
+        
 	if (SMBC_parse_path(frame,
-			ocontext,
-			oname,
-			&workgroup,
-			&server1,
-			&share1,
-			&path1,
-			&user1,
-			&password1,
-                        NULL)) {
+                            ocontext,
+                            oname,
+                            &workgroup,
+                            &server1,
+                            &share1,
+                            &path1,
+                            &user1,
+                            &password1,
+                            NULL)) {
                 errno = EINVAL;
 		TALLOC_FREE(frame);
 		return -1;
 	}
-
+        
 	if (!user1 || user1[0] == (char)0) {
 		user1 = talloc_strdup(frame, ocontext->config.user);
 		if (!user1) {
@@ -1841,22 +1855,22 @@ SMBC_rename_ctx(SMBCCTX *ocontext,
 			return -1;
 		}
 	}
-
+        
 	if (SMBC_parse_path(frame,
-				ncontext,
-				nname,
-				NULL,
-				&server2,
-				&share2,
-				&path2,
-				&user2,
-				&password2,
-				NULL)) {
+                            ncontext,
+                            nname,
+                            NULL,
+                            &server2,
+                            &share2,
+                            &path2,
+                            &user2,
+                            &password2,
+                            NULL)) {
                 errno = EINVAL;
 		TALLOC_FREE(frame);
                 return -1;
 	}
-
+        
 	if (!user2 || user2[0] == (char)0) {
 		user2 = talloc_strdup(frame, ncontext->config.user);
 		if (!user2) {
@@ -1865,7 +1879,7 @@ SMBC_rename_ctx(SMBCCTX *ocontext,
 			return -1;
 		}
 	}
-
+        
 	if (strcmp(server1, server2) || strcmp(share1, share2) ||
 	    strcmp(user1, user2)) {
 		/* Can't rename across file systems, or users?? */
@@ -1873,18 +1887,18 @@ SMBC_rename_ctx(SMBCCTX *ocontext,
 		TALLOC_FREE(frame);
 		return -1;
 	}
-
+        
 	srv = SMBC_server(frame, ocontext, True,
                           server1, share1, &workgroup, &user1, &password1);
 	if (!srv) {
 		TALLOC_FREE(frame);
 		return -1;
-
+                
 	}
-
+        
 	/*d_printf(">>>rename: resolving %s\n", path1);*/
 	if (!cli_resolve_path(frame, "", srv->cli, path1,
-				&targetcli1, &targetpath1)) {
+                              &targetcli1, &targetpath1)) {
 		d_printf("Could not resolve %s\n", path1);
 		TALLOC_FREE(frame);
 		return -1;
@@ -1892,13 +1906,13 @@ SMBC_rename_ctx(SMBCCTX *ocontext,
 	/*d_printf(">>>rename: resolved path as %s\n", targetpath1);*/
 	/*d_printf(">>>rename: resolving %s\n", path2);*/
 	if (!cli_resolve_path(frame, "", srv->cli, path2,
-				&targetcli2, &targetpath2)) {
+                              &targetcli2, &targetpath2)) {
 		d_printf("Could not resolve %s\n", path2);
 		TALLOC_FREE(frame);
 		return -1;
 	}
 	/*d_printf(">>>rename: resolved path as %s\n", targetpath2);*/
-
+        
 	if (strcmp(targetcli1->desthost, targetcli2->desthost) ||
             strcmp(targetcli1->share, targetcli2->share))
 	{
@@ -1907,21 +1921,21 @@ SMBC_rename_ctx(SMBCCTX *ocontext,
 		TALLOC_FREE(frame);
 		return -1;
 	}
-
+        
 	if (!cli_rename(targetcli1, targetpath1, targetpath2)) {
 		int eno = SMBC_errno(ocontext, targetcli1);
-
+                
 		if (eno != EEXIST ||
 		    !cli_unlink(targetcli1, targetpath2) ||
 		    !cli_rename(targetcli1, targetpath1, targetpath2)) {
-
+                        
 			errno = eno;
 			TALLOC_FREE(frame);
 			return -1;
-
+                        
 		}
 	}
-
+        
 	TALLOC_FREE(frame);
 	return 0; /* Success */
 }
diff --git a/source3/libsmb/libsmb_file.c b/source3/libsmb/libsmb_file.c
index 62b990ed00..73c9b96978 100644
--- a/source3/libsmb/libsmb_file.c
+++ b/source3/libsmb/libsmb_file.c
@@ -37,7 +37,11 @@ SMBC_open_ctx(SMBCCTX *context,
               int flags,
               mode_t mode)
 {
-	char *server = NULL, *share = NULL, *user = NULL, *password = NULL, *workgroup = NULL;
+	char *server = NULL;
+        char *share = NULL;
+        char *user = NULL;
+        char *password = NULL;
+        char *workgroup = NULL;
 	char *path = NULL;
 	char *targetpath = NULL;
 	struct cli_state *targetcli = NULL;
@@ -45,38 +49,38 @@ SMBC_open_ctx(SMBCCTX *context,
 	SMBCFILE *file = NULL;
 	int fd;
 	TALLOC_CTX *frame = talloc_stackframe();
-
+        
 	if (!context || !context->internal->initialized) {
-
+                
 		errno = EINVAL;  /* Best I can think of ... */
 		TALLOC_FREE(frame);
 		return NULL;
-
+                
 	}
-
+        
 	if (!fname) {
-
+                
 		errno = EINVAL;
 		TALLOC_FREE(frame);
 		return NULL;
-
+                
 	}
-
+        
 	if (SMBC_parse_path(frame,
-				context,
-				fname,
-				&workgroup,
-				&server,
-				&share,
-				&path,
-				&user,
-				&password,
-				NULL)) {
+                            context,
+                            fname,
+                            &workgroup,
+                            &server,
+                            &share,
+                            &path,
+                            &user,
+                            &password,
+                            NULL)) {
 		errno = EINVAL;
 		TALLOC_FREE(frame);
 		return NULL;
         }
-
+        
 	if (!user || user[0] == (char)0) {
 		user = talloc_strdup(frame, context->config.user);
 		if (!user) {
@@ -85,62 +89,63 @@ SMBC_open_ctx(SMBCCTX *context,
 			return NULL;
 		}
 	}
-
+        
 	srv = SMBC_server(frame, context, True,
                           server, share, &workgroup, &user, &password);
-
+        
 	if (!srv) {
 		if (errno == EPERM) errno = EACCES;
 		TALLOC_FREE(frame);
 		return NULL;  /* SMBC_server sets errno */
 	}
-
+        
 	/* Hmmm, the test for a directory is suspect here ... FIXME */
-
+        
 	if (strlen(path) > 0 && path[strlen(path) - 1] == '\\') {
 		fd = -1;
 	} else {
 		file = SMB_MALLOC_P(SMBCFILE);
-
+                
 		if (!file) {
 			errno = ENOMEM;
 			TALLOC_FREE(frame);
 			return NULL;
 		}
-
+                
 		ZERO_STRUCTP(file);
-
+                
 		/*d_printf(">>>open: resolving %s\n", path);*/
-		if (!cli_resolve_path(frame, "", srv->cli, path, &targetcli, &targetpath)) {
+		if (!cli_resolve_path(frame, "", srv->cli, path,
+                                      &targetcli, &targetpath)) {
 			d_printf("Could not resolve %s\n", path);
 			SAFE_FREE(file);
 			TALLOC_FREE(frame);
 			return NULL;
 		}
 		/*d_printf(">>>open: resolved %s as %s\n", path, targetpath);*/
-
+                
 		if ((fd = cli_open(targetcli, targetpath, flags,
                                    context->internal->share_mode)) < 0) {
-
+                        
 			/* Handle the error ... */
-
+                        
 			SAFE_FREE(file);
 			errno = SMBC_errno(context, targetcli);
 			TALLOC_FREE(frame);
 			return NULL;
-
+                        
 		}
-
+                
 		/* Fill in file struct */
-
+                
 		file->cli_fd  = fd;
 		file->fname   = SMB_STRDUP(fname);
 		file->srv     = srv;
 		file->offset  = 0;
 		file->file    = True;
-
+                
 		DLIST_ADD(context->internal->files, file);
-
+                
                 /*
                  * If the file was opened in O_APPEND mode, all write
                  * operations should be appended to the file.  To do that,
@@ -171,51 +176,50 @@ SMBC_open_ctx(SMBCCTX *context,
                                 return NULL;
                         }
                 }
-
+                
 		TALLOC_FREE(frame);
 		return file;
-
+                
 	}
-
+        
 	/* Check if opendir needed ... */
-
+        
 	if (fd == -1) {
 		int eno = 0;
-
+                
 		eno = SMBC_errno(context, srv->cli);
 		file = (context->posix_emu.opendir_fn)(context, fname);
 		if (!file) errno = eno;
 		TALLOC_FREE(frame);
 		return file;
-
+                
 	}
-
+        
 	errno = EINVAL; /* FIXME, correct errno ? */
 	TALLOC_FREE(frame);
 	return NULL;
-
+        
 }
 
 /*
  * Routine to create a file 
  */
 
-static int creat_bits = O_WRONLY | O_CREAT | O_TRUNC; /* FIXME: Do we need this */
-
 SMBCFILE *
 SMBC_creat_ctx(SMBCCTX *context,
                const char *path,
                mode_t mode)
 {
-
+        
 	if (!context || !context->internal->initialized) {
-
+                
 		errno = EINVAL;
 		return NULL;
-
+                
 	}
-
-	return SMBC_open_ctx(context, path, creat_bits, mode);
+        
+	return SMBC_open_ctx(context, path,
+                             O_WRONLY | O_CREAT | O_TRUNC, mode);
 }
 
 /*
@@ -234,7 +238,7 @@ SMBC_read_ctx(SMBCCTX *context,
 	char *targetpath = NULL;
 	struct cli_state *targetcli = NULL;
 	TALLOC_CTX *frame = talloc_stackframe();
-
+        
         /*
          * offset:
          *
@@ -245,51 +249,51 @@ SMBC_read_ctx(SMBCCTX *context,
          * retrieving data at an offset greater than 4GB.
          */
         off_t offset;
-
+        
 	if (!context || !context->internal->initialized) {
-
+                
 		errno = EINVAL;
 		TALLOC_FREE(frame);
 		return -1;
-
+                
 	}
-
+        
 	DEBUG(4, ("smbc_read(%p, %d)\n", file, (int)count));
-
+        
 	if (!file || !SMBC_dlist_contains(context->internal->files, file)) {
 		errno = EBADF;
 		TALLOC_FREE(frame);
 		return -1;
-
+                
 	}
-
+        
 	offset = file->offset;
-
+        
 	/* Check that the buffer exists ... */
-
+        
 	if (buf == NULL) {
 		errno = EINVAL;
 		TALLOC_FREE(frame);
 		return -1;
-
+                
 	}
-
+        
 	/*d_printf(">>>read: parsing %s\n", file->fname);*/
 	if (SMBC_parse_path(frame,
-				context,
-				file->fname,
-				NULL,
-				&server,
-				&share,
-				&path,
-				&user,
-				&password,
-				NULL)) {
+                            context,
+                            file->fname,
+                            NULL,
+                            &server,
+                            &share,
+                            &path,
+                            &user,
+                            &password,
+                            NULL)) {
                 errno = EINVAL;
 		TALLOC_FREE(frame);
                 return -1;
         }
-
+        
 	/*d_printf(">>>read: resolving %s\n", path);*/
 	if (!cli_resolve_path(frame, "", file->srv->cli, path,
                               &targetcli, &targetpath)) {
@@ -298,24 +302,24 @@ SMBC_read_ctx(SMBCCTX *context,
 		return -1;
 	}
 	/*d_printf(">>>fstat: resolved path as %s\n", targetpath);*/
-
+        
 	ret = cli_read(targetcli, file->cli_fd, (char *)buf, offset, count);
-
+        
 	if (ret < 0) {
-
+                
 		errno = SMBC_errno(context, targetcli);
 		TALLOC_FREE(frame);
 		return -1;
-
+                
 	}
-
+        
 	file->offset += ret;
-
+        
 	DEBUG(4, ("  --> %d\n", ret));
-
+        
 	TALLOC_FREE(frame);
 	return ret;  /* Success, ret bytes of data ... */
-
+        
 }
 
 /*
@@ -335,50 +339,50 @@ SMBC_write_ctx(SMBCCTX *context,
 	char *targetpath = NULL;
 	struct cli_state *targetcli = NULL;
 	TALLOC_CTX *frame = talloc_stackframe();
-
+        
 	/* First check all pointers before dereferencing them */
-
+        
 	if (!context || !context->internal->initialized) {
-
+                
 		errno = EINVAL;
 		TALLOC_FREE(frame);
 		return -1;
-
+                
 	}
-
+        
 	if (!file || !SMBC_dlist_contains(context->internal->files, file)) {
 		errno = EBADF;
 		TALLOC_FREE(frame);
 		return -1;
 	}
-
+        
 	/* Check that the buffer exists ... */
-
+        
 	if (buf == NULL) {
 		errno = EINVAL;
 		TALLOC_FREE(frame);
 		return -1;
-
+                
 	}
-
+        
         offset = file->offset; /* See "offset" comment in SMBC_read_ctx() */
-
+        
 	/*d_printf(">>>write: parsing %s\n", file->fname);*/
 	if (SMBC_parse_path(frame,
-				context,
-				file->fname,
-				NULL,
-				&server,
-				&share,
-				&path,
-				&user,
-				&password,
-				NULL)) {
+                            context,
+                            file->fname,
+                            NULL,
+                            &server,
+                            &share,
+                            &path,
+                            &user,
+                            &password,
+                            NULL)) {
                 errno = EINVAL;
 		TALLOC_FREE(frame);
                 return -1;
         }
-
+        
 	/*d_printf(">>>write: resolving %s\n", path);*/
 	if (!cli_resolve_path(frame, "", file->srv->cli, path,
                               &targetcli, &targetpath)) {
@@ -387,18 +391,19 @@ SMBC_write_ctx(SMBCCTX *context,
 		return -1;
 	}
 	/*d_printf(">>>write: resolved path as %s\n", targetpath);*/
-
-	ret = cli_write(targetcli, file->cli_fd, 0, (char *)buf, offset, count);
-
+        
+	ret = cli_write(targetcli, file->cli_fd,
+                        0, (char *)buf, offset, count);
+        
 	if (ret <= 0) {
 		errno = SMBC_errno(context, targetcli);
 		TALLOC_FREE(frame);
 		return -1;
-
+                
 	}
-
+        
 	file->offset += ret;
-
+        
 	TALLOC_FREE(frame);
 	return ret;  /* Success, 0 bytes of data ... */
 }
@@ -417,42 +422,42 @@ SMBC_close_ctx(SMBCCTX *context,
 	char *targetpath = NULL;
 	struct cli_state *targetcli = NULL;
 	TALLOC_CTX *frame = talloc_stackframe();
-
+        
 	if (!context || !context->internal->initialized) {
-
+                
 		errno = EINVAL;
 		TALLOC_FREE(frame);
 		return -1;
 	}
-
+        
 	if (!file || !SMBC_dlist_contains(context->internal->files, file)) {
 		errno = EBADF;
 		TALLOC_FREE(frame);
 		return -1;
 	}
-
+        
 	/* IS a dir ... */
 	if (!file->file) {
 		TALLOC_FREE(frame);
 		return (context->posix_emu.closedir_fn)(context, file);
 	}
-
+        
 	/*d_printf(">>>close: parsing %s\n", file->fname);*/
 	if (SMBC_parse_path(frame,
-				context,
-				file->fname,
-				NULL,
-				&server,
-				&share,
-				&path,
-				&user,
-				&password,
-				NULL)) {
+                            context,
+                            file->fname,
+                            NULL,
+                            &server,
+                            &share,
+                            &path,
+                            &user,
+                            &password,
+                            NULL)) {
                 errno = EINVAL;
 		TALLOC_FREE(frame);
                 return -1;
         }
-
+        
 	/*d_printf(">>>close: resolving %s\n", path);*/
 	if (!cli_resolve_path(frame, "", file->srv->cli, path,
                               &targetcli, &targetpath)) {
@@ -461,9 +466,9 @@ SMBC_close_ctx(SMBCCTX *context,
 		return -1;
 	}
 	/*d_printf(">>>close: resolved path as %s\n", targetpath);*/
-
+        
 	if (!cli_close(targetcli, file->cli_fd)) {
-
+                
 		DEBUG(3, ("cli_close failed on %s. purging server.\n", 
 			  file->fname));
 		/* Deallocate slot and remove the server 
@@ -476,14 +481,14 @@ SMBC_close_ctx(SMBCCTX *context,
 		(context->server.remove_unused_server_fn)(context, srv);
 		TALLOC_FREE(frame);
 		return -1;
-
+                
 	}
-
+        
 	DLIST_REMOVE(context->internal->files, file);
 	SAFE_FREE(file->fname);
 	SAFE_FREE(file);
 	TALLOC_FREE(frame);
-
+        
 	return 0;
 }
 
@@ -508,14 +513,14 @@ SMBC_getatr(SMBCCTX * context,
 	struct cli_state *targetcli = NULL;
 	time_t write_time;
 	TALLOC_CTX *frame = talloc_stackframe();
-
+        
 	if (!context || !context->internal->initialized) {
-
+                
 		errno = EINVAL;
 		TALLOC_FREE(frame);
  		return -1;
  	}
-
+        
 	/* path fixup for . and .. */
 	if (strequal(path, ".") || strequal(path, "..")) {
 		fixedpath = talloc_strdup(frame, "\\");
@@ -535,14 +540,14 @@ SMBC_getatr(SMBCCTX * context,
 		trim_string(fixedpath, NULL, "\\.");
 	}
 	DEBUG(4,("SMBC_getatr: sending qpathinfo\n"));
-
+        
 	if (!cli_resolve_path(frame, "", srv->cli, fixedpath,
-				&targetcli, &targetpath)) {
+                              &targetcli, &targetpath)) {
 		d_printf("Couldn't resolve %s\n", path);
 		TALLOC_FREE(frame);
 		return False;
 	}
-
+        
 	if (!srv->no_pathinfo2 &&
             cli_qpathinfo2(targetcli, targetpath,
                            create_time_ts,
@@ -553,45 +558,45 @@ SMBC_getatr(SMBCCTX * context,
 		TALLOC_FREE(frame);
 		return True;
         }
-
+        
 	/* if this is NT then don't bother with the getatr */
 	if (targetcli->capabilities & CAP_NT_SMBS) {
                 errno = EPERM;
 		TALLOC_FREE(frame);
                 return False;
         }
-
+        
 	if (cli_getatr(targetcli, targetpath, mode, size, &write_time)) {
-
+                
                 struct timespec w_time_ts;
-
+                
                 w_time_ts = convert_time_t_to_timespec(write_time);
-
+                
                 if (write_time_ts != NULL) {
 			*write_time_ts = w_time_ts;
                 }
-
+                
                 if (create_time_ts != NULL) {
                         *create_time_ts = w_time_ts;
                 }
-
+                
                 if (access_time_ts != NULL) {
                         *access_time_ts = w_time_ts;
                 }
-
+                
                 if (change_time_ts != NULL) {
                         *change_time_ts = w_time_ts;
                 }
-
+                
 		srv->no_pathinfo2 = True;
 		TALLOC_FREE(frame);
 		return True;
 	}
-
+        
         errno = EPERM;
 	TALLOC_FREE(frame);
 	return False;
-
+        
 }
 
 /*
@@ -615,7 +620,7 @@ SMBC_setatr(SMBCCTX * context, SMBCSRV *srv, char *path,
         int fd;
         int ret;
 	TALLOC_CTX *frame = talloc_stackframe();
-
+        
         /*
          * First, try setpathinfo (if qpathinfo succeeded), for it is the
          * modern function for "new code" to be using, and it works given a
@@ -629,7 +634,7 @@ SMBC_setatr(SMBCCTX * context, SMBCSRV *srv, char *path,
                               write_time,
                               change_time,
                               mode)) {
-
+                
                 /*
                  * setpathinfo is not supported; go to plan B. 
                  *
@@ -639,27 +644,27 @@ SMBC_setatr(SMBCCTX * context, SMBCSRV *srv, char *path,
                  * cli_setattrE() which should work on all OS versions, and
                  * supports both times.
                  */
-
+                
                 /* Don't try {q,set}pathinfo() again, with this server */
                 srv->no_pathinfo = True;
-
+                
                 /* Open the file */
                 if ((fd = cli_open(srv->cli, path, O_RDWR, DENY_NONE)) < 0) {
-
+                        
                         errno = SMBC_errno(context, srv->cli);
 			TALLOC_FREE(frame);
                         return -1;
                 }
-
+                
                 /* Set the new attributes */
                 ret = cli_setattrE(srv->cli, fd,
                                    change_time,
                                    access_time,
                                    write_time);
-
+                
                 /* Close the file */
                 cli_close(srv->cli, fd);
-
+                
                 /*
                  * Unfortunately, setattrE() doesn't have a provision for
                  * setting the access mode (attributes).  We'll have to try
@@ -669,14 +674,14 @@ SMBC_setatr(SMBCCTX * context, SMBCSRV *srv, char *path,
                 if (ret && mode != (uint16) -1) {
                         ret = cli_setatr(srv->cli, path, mode, 0);
                 }
-
+                
                 if (! ret) {
                         errno = SMBC_errno(context, srv->cli);
 			TALLOC_FREE(frame);
                         return False;
                 }
         }
-
+        
 	TALLOC_FREE(frame);
         return True;
 }
@@ -697,56 +702,56 @@ SMBC_lseek_ctx(SMBCCTX *context,
 	char *targetpath = NULL;
 	struct cli_state *targetcli = NULL;
 	TALLOC_CTX *frame = talloc_stackframe();
-
+        
 	if (!context || !context->internal->initialized) {
-
+                
 		errno = EINVAL;
 		TALLOC_FREE(frame);
 		return -1;
 	}
-
+        
 	if (!file || !SMBC_dlist_contains(context->internal->files, file)) {
-
+                
 		errno = EBADF;
 		TALLOC_FREE(frame);
 		return -1;
-
+                
 	}
-
+        
 	if (!file->file) {
-
+                
 		errno = EINVAL;
 		TALLOC_FREE(frame);
 		return -1;      /* Can't lseek a dir ... */
-
+                
 	}
-
+        
 	switch (whence) {
 	case SEEK_SET:
 		file->offset = offset;
 		break;
-
+                
 	case SEEK_CUR:
 		file->offset += offset;
 		break;
-
+                
 	case SEEK_END:
 		/*d_printf(">>>lseek: parsing %s\n", file->fname);*/
 		if (SMBC_parse_path(frame,
-					context,
-					file->fname,
-					NULL,
-					&server,
-					&share,
-					&path,
-					&user,
-					&password,
-					NULL)) {
+                                    context,
+                                    file->fname,
+                                    NULL,
+                                    &server,
+                                    &share,
+                                    &path,
+                                    &user,
+                                    &password,
+                                    NULL)) {
 			errno = EINVAL;
 			TALLOC_FREE(frame);
 			return -1;
 		}
-
+                
 		/*d_printf(">>>lseek: resolving %s\n", path);*/
 		if (!cli_resolve_path(frame, "", file->srv->cli, path,
                                       &targetcli, &targetpath)) {
@@ -755,32 +760,32 @@ SMBC_lseek_ctx(SMBCCTX *context,
 			return -1;
 		}
 		/*d_printf(">>>lseek: resolved path as %s\n", targetpath);*/
-
+                
 		if (!cli_qfileinfo(targetcli, file->cli_fd, NULL,
                                    &size, NULL, NULL, NULL, NULL, NULL))
 		{
-		    SMB_OFF_T b_size = size;
+                        SMB_OFF_T b_size = size;
 			if (!cli_getattrE(targetcli, file->cli_fd,
                                           NULL, &b_size, NULL, NULL, NULL))
-		    {
-			errno = EINVAL;
-			TALLOC_FREE(frame);
-			return -1;
-		    } else
-			size = b_size;
+                        {
+                                errno = EINVAL;
+                                TALLOC_FREE(frame);
+                                return -1;
+                        } else
+                                size = b_size;
 		}
 		file->offset = size + offset;
 		break;
-
+                
 	default:
 		errno = EINVAL;
 		break;
-
+                
 	}
-
+        
 	TALLOC_FREE(frame);
 	return file->offset;
-
+        
 }
 
 
@@ -802,26 +807,26 @@ SMBC_ftruncate_ctx(SMBCCTX *context,
         char *targetpath = NULL;
 	struct cli_state *targetcli = NULL;
 	TALLOC_CTX *frame = talloc_stackframe();
-
+        
 	if (!context || !context->internal->initialized) {
-
+                
 		errno = EINVAL;
 		TALLOC_FREE(frame);
 		return -1;
 	}
-
+        
 	if (!file || !SMBC_dlist_contains(context->internal->files, file)) {
 		errno = EBADF;
 		TALLOC_FREE(frame);
 		return -1;
 	}
-
+        
 	if (!file->file) {
 		errno = EINVAL;
 		TALLOC_FREE(frame);
 		return -1;
 	}
-
+        
 	/*d_printf(">>>fstat: parsing %s\n", file->fname);*/
 	if (SMBC_parse_path(frame,
                             context,
@@ -837,7 +842,7 @@ SMBC_ftruncate_ctx(SMBCCTX *context,
 		TALLOC_FREE(frame);
                 return -1;
         }
-
+        
 	/*d_printf(">>>fstat: resolving %s\n", path);*/
 	if (!cli_resolve_path(frame, "", file->srv->cli, path,
                               &targetcli, &targetpath)) {
@@ -846,14 +851,14 @@ SMBC_ftruncate_ctx(SMBCCTX *context,
 		return -1;
 	}
 	/*d_printf(">>>fstat: resolved path as %s\n", targetpath);*/
-
+        
         if (!cli_ftruncate(targetcli, file->cli_fd, size)) {
                 errno = EINVAL;
                 TALLOC_FREE(frame);
                 return -1;
         }
-
+        
 	TALLOC_FREE(frame);
 	return 0;
-
+        
 }
diff --git a/source3/libsmb/libsmb_misc.c b/source3/libsmb/libsmb_misc.c
index f2fd919ef6..dd7add5a61 100644
--- a/source3/libsmb/libsmb_misc.c
+++ b/source3/libsmb/libsmb_misc.c
@@ -50,24 +50,24 @@ SMBC_errno(SMBCCTX *context,
            struct cli_state *c)
 {
 	int ret = cli_errno(c);
-	
+        
         if (cli_is_dos_error(c)) {
                 uint8 eclass;
                 uint32 ecode;
-
+                
                 cli_dos_error(c, &eclass, &ecode);
                 
                 DEBUG(3,("smbc_error %d %d (0x%x) -> %d\n", 
                          (int)eclass, (int)ecode, (int)ecode, ret));
         } else {
                 NTSTATUS status;
-
+                
                 status = cli_nt_error(c);
-
+                
                 DEBUG(3,("smbc errno %s -> %d\n",
                          nt_errstr(status), ret));
         }
-
+        
 	return ret;
 }
 
diff --git a/source3/libsmb/libsmb_path.c b/source3/libsmb/libsmb_path.c
index 6706a59ba8..c962f898e0 100644
--- a/source3/libsmb/libsmb_path.c
+++ b/source3/libsmb/libsmb_path.c
@@ -31,13 +31,13 @@
 static int 
 hex2int( unsigned int _char )
 {
-    if ( _char >= 'A' && _char <='F')
-	return _char - 'A' + 10;
-    if ( _char >= 'a' && _char <='f')
-	return _char - 'a' + 10;
-    if ( _char >= '0' && _char <='9')
-	return _char - '0';
-    return -1;
+        if ( _char >= 'A' && _char <='F')
+                return _char - 'A' + 10;
+        if ( _char >= 'a' && _char <='f')
+                return _char - 'a' + 10;
+        if ( _char >= '0' && _char <='9')
+                return _char - '0';
+        return -1;
 }
 
 /*
@@ -60,19 +60,19 @@ urldecode_talloc(TALLOC_CTX *ctx, char **pp_dest, const char *src)
 	int err_count = 0;
 	size_t newlen = 1;
 	char *p, *dest;
-
+        
 	if (old_length == 0) {
 		return 0;
 	}
-
+        
 	*pp_dest = NULL;
 	for (i = 0; i < old_length; ) {
 		unsigned char character = src[i++];
-
+                
 		if (character == '%') {
 			int a = i+1 < old_length ? hex2int(src[i]) : -1;
 			int b = i+1 < old_length ? hex2int(src[i+1]) : -1;
-
+                        
 			/* Replace valid sequence */
 			if (a != -1 && b != -1) {
 				/* Replace valid %xx sequence with %dd */
@@ -87,20 +87,20 @@ urldecode_talloc(TALLOC_CTX *ctx, char **pp_dest, const char *src)
 		}
 		newlen++;
 	}
-
+        
 	dest = TALLOC_ARRAY(ctx, char, newlen);
 	if (!dest) {
 		return err_count;
 	}
-
+        
 	err_count = 0;
 	for (p = dest, i = 0; i < old_length; ) {
                 unsigned char character = src[i++];
-
+                
                 if (character == '%') {
                         int a = i+1 < old_length ? hex2int(src[i]) : -1;
                         int b = i+1 < old_length ? hex2int(src[i+1]) : -1;
-
+                        
                         /* Replace valid sequence */
                         if (a != -1 && b != -1) {
                                 /* Replace valid %xx sequence with %dd */
@@ -115,7 +115,7 @@ urldecode_talloc(TALLOC_CTX *ctx, char **pp_dest, const char *src)
                 }
                 *p++ = character;
         }
-
+        
         *p = '\0';
 	*pp_dest = dest;
         return err_count;
@@ -129,7 +129,7 @@ SMBC_urldecode(char *dest,
 	TALLOC_CTX *frame = talloc_stackframe();
 	char *pdest;
 	int ret = urldecode_talloc(frame, &pdest, src);
-
+        
 	if (pdest) {
 		strlcpy(dest, pdest, max_dest_len);
 	}
@@ -151,9 +151,9 @@ SMBC_urlencode(char *dest,
                int max_dest_len)
 {
         char hex[] = "0123456789ABCDEF";
-
+        
         for (; *src != '\0' && max_dest_len >= 3; src++) {
-
+                
                 if ((*src < '0' &&
                      *src != '-' &&
                      *src != '.') ||
@@ -172,10 +172,10 @@ SMBC_urlencode(char *dest,
                         max_dest_len--;
                 }
         }
-
+        
         *dest++ = '\0';
         max_dest_len--;
-
+        
         return max_dest_len;
 }
 
@@ -196,9 +196,9 @@ SMBC_urlencode(char *dest,
  *
  *                  The method of locating the list of workgroups varies
  *                  depending upon the setting of the context variable
- *                  context->browse_max_lmb_count.  This value determines
- *                  the maximum number of local master browsers to query
- *                  for the list of workgroups.  In order to ensure that
+ *                  context->options.browse_max_lmb_count.  This value
+ *                  determines the maximum number of local master browsers to
+ *                  query for the list of workgroups.  In order to ensure that
  *                  a complete list of workgroups is obtained, all master
  *                  browsers must be queried, but if there are many
  *                  workgroups, the time spent querying can begin to add up.
@@ -234,75 +234,75 @@ SMBC_parse_path(TALLOC_CTX *ctx,
 	const char *p;
 	char *q, *r;
 	int len;
-
+        
 	/* Ensure these returns are at least valid pointers. */
 	*pp_server = talloc_strdup(ctx, "");
 	*pp_share = talloc_strdup(ctx, "");
 	*pp_path = talloc_strdup(ctx, "");
 	*pp_user = talloc_strdup(ctx, "");
 	*pp_password = talloc_strdup(ctx, "");
-
+        
 	if (!*pp_server || !*pp_share || !*pp_path ||
-			!*pp_user || !*pp_password) {
+            !*pp_user || !*pp_password) {
 		return -1;
 	}
-
+        
         /*
          * Assume we wont find an authentication domain to parse, so default
          * to the workgroup in the provided context.
          */
 	if (pp_workgroup != NULL) {
 		*pp_workgroup =
-                    talloc_strdup(ctx, context->config.workgroup);
+                        talloc_strdup(ctx, context->config.workgroup);
 	}
-
+        
 	if (pp_options) {
 		*pp_options = talloc_strdup(ctx, "");
 	}
 	s = talloc_strdup(ctx, fname);
-
+        
 	/* see if it has the right prefix */
 	len = strlen(smbc_prefix);
 	if (strncmp(s,smbc_prefix,len) || (s[len] != '/' && s[len] != 0)) {
                 return -1; /* What about no smb: ? */
         }
-
+        
 	p = s + len;
-
+        
 	/* Watch the test below, we are testing to see if we should exit */
-
+        
 	if (strncmp(p, "//", 2) && strncmp(p, "\\\\", 2)) {
                 DEBUG(1, ("Invalid path (does not begin with smb://"));
 		return -1;
 	}
-
+        
 	p += 2;  /* Skip the double slash */
-
+        
         /* See if any options were specified */
         if ((q = strrchr(p, '?')) != NULL ) {
                 /* There are options.  Null terminate here and point to them */
                 *q++ = '\0';
-
+                
                 DEBUG(4, ("Found options '%s'", q));
-
+                
 		/* Copy the options */
 		if (*pp_options != NULL) {
 			TALLOC_FREE(*pp_options);
 			*pp_options = talloc_strdup(ctx, q);
 		}
 	}
-
+        
 	if (*p == '\0') {
 		goto decoding;
 	}
-
+        
 	if (*p == '/') {
 		int wl = strlen(context->config.workgroup);
-
+                
 		if (wl > 16) {
 			wl = 16;
 		}
-
+                
 		*pp_server = talloc_strdup(ctx, context->config.workgroup);
 		if (!*pp_server) {
 			return -1;
@@ -310,27 +310,27 @@ SMBC_parse_path(TALLOC_CTX *ctx,
                	*pp_server[wl] = '\0';
 		return 0;
 	}
-
+        
 	/*
 	 * ok, its for us. Now parse out the server, share etc.
 	 *
 	 * However, we want to parse out [[domain;]user[:password]@] if it
 	 * exists ...
 	 */
-
+        
 	/* check that '@' occurs before '/', if '/' exists at all */
 	q = strchr_m(p, '@');
 	r = strchr_m(p, '/');
 	if (q && (!r || q < r)) {
 		char *userinfo = NULL;
 		const char *u;
-
+                
 		next_token_no_ltrim_talloc(ctx, &p, &userinfo, "@");
 		if (!userinfo) {
 			return -1;
 		}
 		u = userinfo;
-
+                
 		if (strchr_m(u, ';')) {
 			char *workgroup;
 			next_token_no_ltrim_talloc(ctx, &u, &workgroup, ";");
@@ -341,7 +341,7 @@ SMBC_parse_path(TALLOC_CTX *ctx,
 				*pp_workgroup = workgroup;
 			}
 		}
-
+                
 		if (strchr_m(u, ':')) {
 			next_token_no_ltrim_talloc(ctx, &u, pp_user, ":");
 			if (!*pp_user) {
@@ -358,27 +358,27 @@ SMBC_parse_path(TALLOC_CTX *ctx,
 			}
 		}
 	}
-
+        
 	if (!next_token_talloc(ctx, &p, pp_server, "/")) {
 		return -1;
 	}
-
+        
 	if (*p == (char)0) {
 		goto decoding;  /* That's it ... */
 	}
-
+        
 	if (!next_token_talloc(ctx, &p, pp_share, "/")) {
 		return -1;
 	}
-
+        
         /*
          * Prepend a leading slash if there's a file path, as required by
          * NetApp filers.
          */
         if (*p != '\0') {
 		*pp_path = talloc_asprintf(ctx,
-					"\\%s",
-					p);
+                                           "\\%s",
+                                           p);
         } else {
 		*pp_path = talloc_strdup(ctx, "");
 	}
@@ -386,15 +386,15 @@ SMBC_parse_path(TALLOC_CTX *ctx,
 		return -1;
 	}
 	string_replace(*pp_path, '/', '\\');
-
- decoding:
-
+        
+decoding:
+        
 	(void) urldecode_talloc(ctx, pp_path, *pp_path);
 	(void) urldecode_talloc(ctx, pp_server, *pp_server);
 	(void) urldecode_talloc(ctx, pp_share, *pp_share);
 	(void) urldecode_talloc(ctx, pp_user, *pp_user);
 	(void) urldecode_talloc(ctx, pp_password, *pp_password);
-
+        
 	return 0;
 }
 
diff --git a/source3/libsmb/libsmb_printjob.c b/source3/libsmb/libsmb_printjob.c
index a03c15e024..545225cae4 100644
--- a/source3/libsmb/libsmb_printjob.c
+++ b/source3/libsmb/libsmb_printjob.c
@@ -41,39 +41,39 @@ SMBC_open_print_job_ctx(SMBCCTX *context,
 	char *password = NULL;
 	char *path = NULL;
 	TALLOC_CTX *frame = talloc_stackframe();
-
+        
 	if (!context || !context->internal->initialized) {
-
+                
                 errno = EINVAL;
 		TALLOC_FREE(frame);
                 return NULL;
         }
-
+        
         if (!fname) {
                 errno = EINVAL;
 		TALLOC_FREE(frame);
                 return NULL;
         }
-
+        
         DEBUG(4, ("SMBC_open_print_job_ctx(%s)\n", fname));
-
+        
         if (SMBC_parse_path(frame,
-				context,
-				fname,
-				NULL,
-				&server,
-				&share,
-				&path,
-				&user,
-				&password,
-				NULL)) {
+                            context,
+                            fname,
+                            NULL,
+                            &server,
+                            &share,
+                            &path,
+                            &user,
+                            &password,
+                            NULL)) {
                 errno = EINVAL;
 		TALLOC_FREE(frame);
                 return NULL;
         }
-
+        
         /* What if the path is empty, or the file exists? */
-
+        
 	TALLOC_FREE(frame);
         return (context->posix_emu.open_fn)(context, fname, O_WRONLY, 666);
 }
@@ -98,77 +98,79 @@ SMBC_print_file_ctx(SMBCCTX *c_file,
         int tot_bytes = 0;
         char buf[4096];
 	TALLOC_CTX *frame = talloc_stackframe();
-
+        
         if (!c_file || !c_file->internal->initialized ||
             !c_print || !c_print->internal->initialized) {
-
+                
                 errno = EINVAL;
 		TALLOC_FREE(frame);
                 return -1;
-
+                
         }
-
+        
         if (!fname && !printq) {
-
+                
                 errno = EINVAL;
 		TALLOC_FREE(frame);
                 return -1;
-
+                
         }
-
+        
         /* Try to open the file for reading ... */
-
-        if ((long)(fid1 = smbc_getFunctionOpen(c_file)(c_file, fname, O_RDONLY, 0666)) < 0) {
+        
+        if ((long)(fid1 = smbc_getFunctionOpen(c_file)(c_file, fname,
+                                                       O_RDONLY, 0666)) < 0) {
                 DEBUG(3, ("Error, fname=%s, errno=%i\n", fname, errno));
 		TALLOC_FREE(frame);
                 return -1;  /* smbc_open sets errno */
         }
-
+        
         /* Now, try to open the printer file for writing */
-
-        if ((long)(fid2 = smbc_getFunctionOpenPrintJob(c_print)(c_print, printq)) < 0) {
-
+        
+        if ((long)(fid2 = smbc_getFunctionOpenPrintJob(c_print)(c_print,
+                                                                printq)) < 0) {
+                
                 saverr = errno;  /* Save errno */
                 smbc_getFunctionClose(c_file)(c_file, fid1);
                 errno = saverr;
 		TALLOC_FREE(frame);
                 return -1;
-
+                
         }
-
+        
         while ((bytes = smbc_getFunctionRead(c_file)(c_file, fid1,
                                                      buf, sizeof(buf))) > 0) {
-
+                
                 tot_bytes += bytes;
-
+                
                 if ((smbc_getFunctionWrite(c_print)(c_print, fid2,
                                                     buf, bytes)) < 0) {
-
+                        
                         saverr = errno;
                         smbc_getFunctionClose(c_file)(c_file, fid1);
                         smbc_getFunctionClose(c_print)(c_print, fid2);
                         errno = saverr;
-
+                        
                 }
-
+                
         }
-
+        
         saverr = errno;
-
-        smbc_getFunctionClose(c_file)(c_file, fid1);  /* We have to close these anyway */
+        
+        smbc_getFunctionClose(c_file)(c_file, fid1);
         smbc_getFunctionClose(c_print)(c_print, fid2);
-
+        
         if (bytes < 0) {
-
+                
                 errno = saverr;
 		TALLOC_FREE(frame);
                 return -1;
-
+                
         }
-
+        
 	TALLOC_FREE(frame);
         return tot_bytes;
-
+        
 }
 
 /*
@@ -188,37 +190,37 @@ SMBC_list_print_jobs_ctx(SMBCCTX *context,
 	char *workgroup = NULL;
 	char *path = NULL;
 	TALLOC_CTX *frame = talloc_stackframe();
-
+        
 	if (!context || !context->internal->initialized) {
-
+                
                 errno = EINVAL;
 		TALLOC_FREE(frame);
                 return -1;
         }
-
+        
         if (!fname) {
                 errno = EINVAL;
 		TALLOC_FREE(frame);
                 return -1;
         }
-
+        
         DEBUG(4, ("smbc_list_print_jobs(%s)\n", fname));
-
+        
         if (SMBC_parse_path(frame,
-				context,
-				fname,
-				&workgroup,
-				&server,
-				&share,
-				&path,
-				&user,
-				&password,
-				NULL)) {
+                            context,
+                            fname,
+                            &workgroup,
+                            &server,
+                            &share,
+                            &path,
+                            &user,
+                            &password,
+                            NULL)) {
 		errno = EINVAL;
 		TALLOC_FREE(frame);
 		return -1;
         }
-
+        
         if (!user || user[0] == (char)0) {
 		user = talloc_strdup(frame, context->config.user);
 		if (!user) {
@@ -227,25 +229,25 @@ SMBC_list_print_jobs_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 (cli_print_queue(srv->cli,
                             (void (*)(struct print_job_info *))fn) < 0) {
                 errno = SMBC_errno(context, srv->cli);
 		TALLOC_FREE(frame);
                 return -1;
         }
-
+        
 	TALLOC_FREE(frame);
         return 0;
-
+        
 }
 
 /*
@@ -266,37 +268,37 @@ SMBC_unlink_print_job_ctx(SMBCCTX *context,
 	char *path = NULL;
         int err;
 	TALLOC_CTX *frame = talloc_stackframe();
-
+        
 	if (!context || !context->internal->initialized) {
-
+                
                 errno = EINVAL;
 		TALLOC_FREE(frame);
                 return -1;
         }
-
+        
         if (!fname) {
                 errno = EINVAL;
 		TALLOC_FREE(frame);
                 return -1;
         }
-
+        
         DEBUG(4, ("smbc_unlink_print_job(%s)\n", fname));
-
+        
         if (SMBC_parse_path(frame,
-				context,
-				fname,
-				&workgroup,
-				&server,
-				&share,
-				&path,
-				&user,
-				&password,
-				NULL)) {
+                            context,
+                            fname,
+                            &workgroup,
+                            &server,
+                            &share,
+                            &path,
+                            &user,
+                            &password,
+                            NULL)) {
 		errno = EINVAL;
 		TALLOC_FREE(frame);
 		return -1;
         }
-
+        
         if (!user || user[0] == (char)0) {
 		user = talloc_strdup(frame, context->config.user);
 		if (!user) {
@@ -305,30 +307,30 @@ SMBC_unlink_print_job_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 ((err = cli_printjob_del(srv->cli, id)) != 0) {
-
+                
                 if (err < 0)
                         errno = SMBC_errno(context, srv->cli);
                 else if (err == ERRnosuchprintjob)
                         errno = EINVAL;
 		TALLOC_FREE(frame);
                 return -1;
-
+                
         }
-
+        
 	TALLOC_FREE(frame);
         return 0;
-
+        
 }
 
diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c
index 70e0d57273..4f51388870 100644
--- a/source3/libsmb/libsmb_server.c
+++ b/source3/libsmb/libsmb_server.c
@@ -40,7 +40,7 @@ SMBC_check_server(SMBCCTX * context,
 {
         socklen_t size;
         struct sockaddr addr;
-
+        
         size = sizeof(addr);
         return (getpeername(server->cli->fd, &addr, &size) == -1);
 }
@@ -56,12 +56,12 @@ SMBC_remove_unused_server(SMBCCTX * context,
                           SMBCSRV * srv)
 {
 	SMBCFILE * file;
-
+        
 	/* are we being fooled ? */
 	if (!context || !context->internal->initialized || !srv) {
                 return 1;
         }
-	
+        
 	/* Check all open files/directories for a relation with this server */
 	for (file = context->internal->files; file; file = file->next) {
 		if (file->srv == srv) {
@@ -72,16 +72,16 @@ SMBC_remove_unused_server(SMBCCTX * context,
 			return 1;
 		}
 	}
-
+        
 	DLIST_REMOVE(context->internal->servers, srv);
-
+        
 	cli_shutdown(srv->cli);
 	srv->cli = NULL;
-
+        
 	DEBUG(3, ("smbc_remove_usused_server: %p removed.\n", srv));
-
+        
 	(context->cache.remove_cached_server_fn)(context, srv);
-
+        
         SAFE_FREE(srv);
 	return 0;
 }
@@ -101,21 +101,21 @@ SMBC_call_auth_fn(TALLOC_CTX *ctx,
 	fstring workgroup;
 	fstring username;
 	fstring password;
-
+        
 	strlcpy(workgroup, *pp_workgroup, sizeof(workgroup));
 	strlcpy(username, *pp_username, sizeof(username));
 	strlcpy(password, *pp_password, sizeof(password));
-
+        
         (context->server.get_auth_data_fn)(
                 server, share,
                 workgroup, sizeof(workgroup),
                 username, sizeof(username),
                 password, sizeof(password));
-
+        
 	TALLOC_FREE(*pp_workgroup);
 	TALLOC_FREE(*pp_username);
 	TALLOC_FREE(*pp_password);
-
+        
 	*pp_workgroup = talloc_strdup(ctx, workgroup);
 	*pp_username = talloc_strdup(ctx, username);
 	*pp_password = talloc_strdup(ctx, password);
@@ -144,23 +144,23 @@ SMBC_find_server(TALLOC_CTX *ctx,
 {
         SMBCSRV *srv;
         int auth_called = 0;
-
- check_server_cache:
-
+        
+check_server_cache:
+        
 	srv = (context->cache.get_cached_server_fn)(context,
                                                     server, share,
                                                     *pp_workgroup,
                                                     *pp_username);
-
+        
 	if (!auth_called && !srv && (!*pp_username || !(*pp_username)[0] ||
-				!*pp_password || !(*pp_password)[0])) {
+                                     !*pp_password || !(*pp_password)[0])) {
 		SMBC_call_auth_fn(ctx, context, server, share,
-				pp_workgroup, pp_username, pp_password);
-
+                                  pp_workgroup, pp_username, pp_password);
+                
 		if (!pp_workgroup || !pp_username || !pp_password) {
 			return NULL;
 		}
-
+                
 		/*
                  * However, smbc_auth_fn may have picked up info relating to
                  * an existing connection, so try for an existing connection
@@ -168,9 +168,9 @@ SMBC_find_server(TALLOC_CTX *ctx,
                  */
 		auth_called = 1;
 		goto check_server_cache;
-
+                
 	}
-
+        
 	if (srv) {
 		if ((context->server.check_server_fn)(context, srv)) {
 			/*
@@ -189,17 +189,17 @@ SMBC_find_server(TALLOC_CTX *ctx,
 				(context->cache.remove_cached_server_fn)(context,
                                                                          srv);
 			}
-
+                        
 			/*
                          * Maybe there are more cached connections to this
                          * server
                          */
 			goto check_server_cache;
 		}
-
+                
 		return srv;
  	}
-
+        
         return NULL;
 }
 
@@ -234,25 +234,25 @@ SMBC_server(TALLOC_CTX *ctx,
         int port_try_next;
         const char *username_used;
  	NTSTATUS status;
-
+        
 	zero_addr(&ss);
 	ZERO_STRUCT(c);
-
+        
 	if (server[0] == 0) {
 		errno = EPERM;
 		return NULL;
 	}
-
+        
         /* Look for a cached connection */
         srv = SMBC_find_server(ctx, context, server, share,
-                          pp_workgroup, pp_username, pp_password);
-
+                               pp_workgroup, pp_username, pp_password);
+        
         /*
          * If we found a connection and we're only allowed one share per
          * server...
          */
-        if (srv && *share != '\0' && context->internal->one_share_per_server) {
-
+        if (srv && *share != '\0' && context->options.one_share_per_server) {
+                
                 /*
                  * ... then if there's no current connection to the share,
                  * connect to it.  SMBC_find_server(), or rather the function
@@ -264,8 +264,10 @@ SMBC_server(TALLOC_CTX *ctx,
                 if (srv->cli->cnum == (uint16) -1) {
                         /* Ensure we have accurate auth info */
 			SMBC_call_auth_fn(ctx, context, server, share,
-				pp_workgroup, pp_username, pp_password);
-
+                                          pp_workgroup,
+                                          pp_username,
+                                          pp_password);
+                        
 			if (!*pp_workgroup || !*pp_username || !*pp_password) {
 				errno = ENOMEM;
 				cli_shutdown(srv->cli);
@@ -274,17 +276,17 @@ SMBC_server(TALLOC_CTX *ctx,
                                                                          srv);
 				return NULL;
 			}
-
+                        
 			/*
 			 * We don't need to renegotiate encryption
 			 * here as the encryption context is not per
 			 * tid.
 			 */
-
+                        
 			if (!cli_send_tconX(srv->cli, share, "?????",
-						*pp_password,
-						strlen(*pp_password)+1)) {
-
+                                            *pp_password,
+                                            strlen(*pp_password)+1)) {
+                                
                                 errno = SMBC_errno(context, srv->cli);
                                 cli_shutdown(srv->cli);
 				srv->cli = NULL;
@@ -292,7 +294,7 @@ SMBC_server(TALLOC_CTX *ctx,
                                                                          srv);
                                 srv = NULL;
                         }
-
+                        
                         /*
                          * Regenerate the dev value since it's based on both
                          * server and share
@@ -303,51 +305,51 @@ SMBC_server(TALLOC_CTX *ctx,
                         }
                 }
         }
-
+        
         /* If we have a connection... */
         if (srv) {
-
+                
                 /* ... then we're done here.  Give 'em what they came for. */
                 return srv;
         }
-
+        
         /* If we're not asked to connect when a connection doesn't exist... */
         if (! connect_if_not_found) {
                 /* ... then we're done here. */
                 return NULL;
         }
-
+        
 	if (!*pp_workgroup || !*pp_username || !*pp_password) {
 		errno = ENOMEM;
 		return NULL;
 	}
-
+        
 	make_nmb_name(&calling, context->config.netbios_name, 0x0);
 	make_nmb_name(&called , server, 0x20);
-
+        
 	DEBUG(4,("SMBC_server: server_n=[%s] server=[%s]\n", server_n, server));
-
+        
 	DEBUG(4,(" -> server_n=[%s] server=[%s]\n", server_n, server));
-
- again:
-
+        
+again:
+        
 	zero_addr(&ss);
-
+        
 	/* have to open a new connection */
 	if ((c = cli_initialise()) == NULL) {
 		errno = ENOMEM;
 		return NULL;
 	}
-
+        
 	if (context->flags.bits & SMB_CTX_FLAG_USE_KERBEROS) {
 		c->use_kerberos = True;
 	}
 	if (context->flags.bits & SMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS) {
 		c->fallback_after_kerberos = True;
 	}
-
+        
 	c->timeout = context->config.timeout;
-
+        
         /*
          * Force use of port 139 for first try if share is $IPC, empty, or
          * null, so browse lists can work
@@ -359,15 +361,15 @@ SMBC_server(TALLOC_CTX *ctx,
                 port_try_first = 445;
                 port_try_next = 139;
         }
-
+        
         c->port = port_try_first;
-
+        
 	status = cli_connect(c, server_n, &ss);
 	if (!NT_STATUS_IS_OK(status)) {
-
+                
                 /* First connection attempt failed.  Try alternate port. */
                 c->port = port_try_next;
-
+                
                 status = cli_connect(c, server_n, &ss);
 		if (!NT_STATUS_IS_OK(status)) {
 			cli_shutdown(c);
@@ -375,33 +377,36 @@ SMBC_server(TALLOC_CTX *ctx,
 			return NULL;
 		}
 	}
-
+        
 	if (!cli_session_request(c, &calling, &called)) {
 		cli_shutdown(c);
 		if (strcmp(called.name, "*SMBSERVER")) {
 			make_nmb_name(&called , "*SMBSERVER", 0x20);
 			goto again;
 		} else {  /* Try one more time, but ensure we don't loop */
-
+                        
 			/* Only try this if server is an IP address ... */
-
+                        
 			if (is_ipaddress(server) && !tried_reverse) {
 				fstring remote_name;
 				struct sockaddr_storage rem_ss;
-
+                                
 				if (!interpret_string_addr(&rem_ss, server,
-							NI_NUMERICHOST)) {
+                                                           NI_NUMERICHOST)) {
 					DEBUG(4, ("Could not convert IP address "
-						"%s to struct sockaddr_storage\n",
-						server));
+                                                  "%s to struct sockaddr_storage\n",
+                                                  server));
 					errno = ETIMEDOUT;
 					return NULL;
 				}
-
+                                
 				tried_reverse++; /* Yuck */
-
-				if (name_status_find("*", 0, 0, &rem_ss, remote_name)) {
-					make_nmb_name(&called, remote_name, 0x20);
+                                
+				if (name_status_find("*", 0, 0,
+                                                     &rem_ss, remote_name)) {
+					make_nmb_name(&called,
+                                                      remote_name,
+                                                      0x20);
 					goto again;
 				}
 			}
@@ -409,64 +414,66 @@ SMBC_server(TALLOC_CTX *ctx,
 		errno = ETIMEDOUT;
 		return NULL;
 	}
-
+        
 	DEBUG(4,(" session request ok\n"));
-
+        
 	if (!cli_negprot(c)) {
 		cli_shutdown(c);
 		errno = ETIMEDOUT;
 		return NULL;
 	}
-
+        
         username_used = *pp_username;
-
+        
 	if (!NT_STATUS_IS_OK(cli_session_setup(c, username_used,
-					       *pp_password, strlen(*pp_password),
-					       *pp_password, strlen(*pp_password),
+					       *pp_password,
+                                               strlen(*pp_password),
+					       *pp_password,
+                                               strlen(*pp_password),
 					       *pp_workgroup))) {
-
+                
                 /* Failed.  Try an anonymous login, if allowed by flags. */
                 username_used = "";
-
+                
                 if ((context->flags.bits &
                      SMBCCTX_FLAG_NO_AUTO_ANONYMOUS_LOGON) ||
                     !NT_STATUS_IS_OK(cli_session_setup(c, username_used,
                                                        *pp_password, 1,
                                                        *pp_password, 0,
                                                        *pp_workgroup))) {
-
+                        
                         cli_shutdown(c);
                         errno = EPERM;
                         return NULL;
                 }
 	}
-
+        
 	DEBUG(4,(" session setup ok\n"));
-
+        
 	if (!cli_send_tconX(c, share, "?????",
 			    *pp_password, strlen(*pp_password)+1)) {
 		errno = SMBC_errno(context, c);
 		cli_shutdown(c);
 		return NULL;
 	}
-
+        
 	DEBUG(4,(" tconx ok\n"));
-
+        
 	if (context->internal->smb_encryption_level) {
 		/* Attempt UNIX smb encryption. */
 		if (!NT_STATUS_IS_OK(cli_force_encryption(c,
-						username_used,
-						*pp_password,
-						*pp_workgroup))) {
-
+                                                          username_used,
+                                                          *pp_password,
+                                                          *pp_workgroup))) {
+                        
 			/*
 			 * context->smb_encryption_level == 1
 			 * means don't fail if encryption can't be negotiated,
 			 * == 2 means fail if encryption can't be negotiated.
 			 */
-
+                        
 			DEBUG(4,(" SMB encrypt failed\n"));
-
+                        
 			if (context->internal->smb_encryption_level == 2) {
 	                        cli_shutdown(c);
 				errno = EPERM;
@@ -475,25 +482,25 @@ SMBC_server(TALLOC_CTX *ctx,
 		}
 		DEBUG(4,(" SMB encrypt ok\n"));
 	}
-
+        
 	/*
 	 * Ok, we have got a nice connection
 	 * Let's allocate a server structure.
 	 */
-
+        
 	srv = SMB_MALLOC_P(SMBCSRV);
 	if (!srv) {
 		errno = ENOMEM;
 		goto failed;
 	}
-
+        
 	ZERO_STRUCTP(srv);
 	srv->cli = c;
 	srv->dev = (dev_t)(str_checksum(server) ^ str_checksum(share));
         srv->no_pathinfo = False;
         srv->no_pathinfo2 = False;
         srv->no_nt_session = False;
-
+        
 	/* now add it to the cache (internal or external)  */
 	/* Let the cache function set errno if it wants to */
 	errno = 0;
@@ -509,19 +516,19 @@ SMBC_server(TALLOC_CTX *ctx,
 		}
 		goto failed;
 	}
-
+        
 	DEBUG(2, ("Server connect ok: //%s/%s: %p\n",
 		  server, share, srv));
-
+        
 	DLIST_ADD(context->internal->servers, srv);
 	return srv;
-
- failed:
+        
+failed:
 	cli_shutdown(c);
 	if (!srv) {
 		return NULL;
 	}
-
+        
 	SAFE_FREE(srv);
 	return NULL;
 }
@@ -545,32 +552,34 @@ SMBC_attr_server(TALLOC_CTX *ctx,
 	struct rpc_pipe_client *pipe_hnd;
         NTSTATUS nt_status;
 	SMBCSRV *ipc_srv=NULL;
-
+        
         /*
          * See if we've already created this special connection.  Reference
          * our "special" share name '*IPC$', which is an impossible real share
          * name due to the leading asterisk.
          */
         ipc_srv = SMBC_find_server(ctx, context, server, "*IPC$",
-                              pp_workgroup, pp_username, pp_password);
+                                   pp_workgroup, pp_username, pp_password);
         if (!ipc_srv) {
-
+                
                 /* We didn't find a cached connection.  Get the password */
 		if (!*pp_password || (*pp_password)[0] == '\0') {
                         /* ... then retrieve it now. */
 			SMBC_call_auth_fn(ctx, context, server, share,
-				pp_workgroup, pp_username, pp_password);
+                                          pp_workgroup,
+                                          pp_username,
+                                          pp_password);
 			if (!*pp_workgroup || !*pp_username || !*pp_password) {
 				errno = ENOMEM;
 				return NULL;
 			}
                 }
-
+                
                 flags = 0;
                 if (context->flags.bits & SMB_CTX_FLAG_USE_KERBEROS) {
                         flags |= CLI_FULL_CONNECTION_USE_KERBEROS;
                 }
-
+                
                 zero_addr(&ss);
                 nt_status = cli_full_connection(&ipc_cli,
 						global_myname(), server,
@@ -586,23 +595,23 @@ SMBC_attr_server(TALLOC_CTX *ctx,
                         errno = ENOTSUP;
                         return NULL;
                 }
-
+                
 		if (context->internal->smb_encryption_level) {
 			/* Attempt UNIX smb encryption. */
 			if (!NT_STATUS_IS_OK(cli_force_encryption(ipc_cli,
-						*pp_username,
-						*pp_password,
-						*pp_workgroup))) {
-
+                                                                  *pp_username,
+                                                                  *pp_password,
+                                                                  *pp_workgroup))) {
+                                
 				/*
 				 * context->smb_encryption_level ==
 				 * 1 means don't fail if encryption can't be
 				 * negotiated, == 2 means fail if encryption
 				 * can't be negotiated.
 				 */
-
+                                
 				DEBUG(4,(" SMB encrypt failed on IPC$\n"));
-
+                                
 				if (context->internal->smb_encryption_level == 2) {
 		                        cli_shutdown(ipc_cli);
 					errno = EPERM;
@@ -611,49 +620,49 @@ SMBC_attr_server(TALLOC_CTX *ctx,
 			}
 			DEBUG(4,(" SMB encrypt ok on IPC$\n"));
 		}
-
+                
                 ipc_srv = SMB_MALLOC_P(SMBCSRV);
                 if (!ipc_srv) {
                         errno = ENOMEM;
                         cli_shutdown(ipc_cli);
                         return NULL;
                 }
-
+                
                 ZERO_STRUCTP(ipc_srv);
                 ipc_srv->cli = ipc_cli;
-
+                
                 pipe_hnd = cli_rpc_pipe_open_noauth(ipc_srv->cli,
                                                     PI_LSARPC,
                                                     &nt_status);
                 if (!pipe_hnd) {
-                    DEBUG(1, ("cli_nt_session_open fail!\n"));
-                    errno = ENOTSUP;
-                    cli_shutdown(ipc_srv->cli);
-                    free(ipc_srv);
-                    return NULL;
+                        DEBUG(1, ("cli_nt_session_open fail!\n"));
+                        errno = ENOTSUP;
+                        cli_shutdown(ipc_srv->cli);
+                        free(ipc_srv);
+                        return NULL;
                 }
-
+                
                 /*
                  * Some systems don't support
                  * SEC_RIGHTS_MAXIMUM_ALLOWED, but NT sends 0x2000000
                  * so we might as well do it too.
                  */
-
+                
                 nt_status = rpccli_lsa_open_policy(
-                    pipe_hnd,
-                    talloc_tos(),
-                    True,
-                    GENERIC_EXECUTE_ACCESS,
-                    &ipc_srv->pol);
-
+                        pipe_hnd,
+                        talloc_tos(),
+                        True,
+                        GENERIC_EXECUTE_ACCESS,
+                        &ipc_srv->pol);
+                
                 if (!NT_STATUS_IS_OK(nt_status)) {
-                    errno = SMBC_errno(context, ipc_srv->cli);
-                    cli_shutdown(ipc_srv->cli);
-                    return NULL;
+                        errno = SMBC_errno(context, ipc_srv->cli);
+                        cli_shutdown(ipc_srv->cli);
+                        return NULL;
                 }
-
+                
                 /* now add it to the cache (internal or external) */
-
+                
                 errno = 0;      /* let cache function set errno if it likes */
                 if ((context->cache.add_cached_server_fn)(context, ipc_srv,
                                                           server,
@@ -668,9 +677,9 @@ SMBC_attr_server(TALLOC_CTX *ctx,
                         free(ipc_srv);
                         return NULL;
                 }
-
+                
                 DLIST_ADD(context->internal->servers, ipc_srv);
         }
-
+        
         return ipc_srv;
 }
diff --git a/source3/libsmb/libsmb_stat.c b/source3/libsmb/libsmb_stat.c
index 6072547e08..b733eab74f 100644
--- a/source3/libsmb/libsmb_stat.c
+++ b/source3/libsmb/libsmb_stat.c
@@ -33,18 +33,18 @@
 
 static ino_t
 generate_inode(SMBCCTX *context,
-           const char *name)
+               const char *name)
 {
 	if (!context || !context->internal->initialized) {
-
+                
 		errno = EINVAL;
 		return -1;
-
+                
 	}
-
+        
 	if (!*name) return 2; /* FIXME, why 2 ??? */
 	return (ino_t)str_checksum(name);
-
+        
 }
 
 /*
@@ -54,26 +54,26 @@ generate_inode(SMBCCTX *context,
 
 static int
 setup_stat(SMBCCTX *context,
-                struct stat *st,
-                char *fname,
-                SMB_OFF_T size,
-                int mode)
+           struct stat *st,
+           char *fname,
+           SMB_OFF_T size,
+           int mode)
 {
 	TALLOC_CTX *frame = talloc_stackframe();
-	
+        
 	st->st_mode = 0;
-
+        
 	if (IS_DOS_DIR(mode)) {
 		st->st_mode = SMBC_DIR_MODE;
 	} else {
 		st->st_mode = SMBC_FILE_MODE;
 	}
-
+        
 	if (IS_DOS_ARCHIVE(mode)) st->st_mode |= S_IXUSR;
 	if (IS_DOS_SYSTEM(mode)) st->st_mode |= S_IXGRP;
 	if (IS_DOS_HIDDEN(mode)) st->st_mode |= S_IXOTH;
 	if (!IS_DOS_READONLY(mode)) st->st_mode |= S_IWUSR;
-
+        
 	st->st_size = size;
 #ifdef HAVE_STAT_ST_BLKSIZE
 	st->st_blksize = 512;
@@ -86,20 +86,20 @@ setup_stat(SMBCCTX *context,
 #endif
 	st->st_uid = getuid();
 	st->st_gid = getgid();
-
+        
 	if (IS_DOS_DIR(mode)) {
 		st->st_nlink = 2;
 	} else {
 		st->st_nlink = 1;
 	}
-
+        
 	if (st->st_ino == 0) {
 		st->st_ino = generate_inode(context, fname);
 	}
-	
+        
 	TALLOC_FREE(frame);
 	return True;  /* FIXME: Is this needed ? */
-
+        
 }
 
 /*
@@ -125,37 +125,37 @@ SMBC_stat_ctx(SMBCCTX *context,
 	uint16 mode = 0;
 	SMB_INO_T ino = 0;
 	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_stat(%s)\n", fname));
-
+        
 	if (SMBC_parse_path(frame,
-				context,
-				fname,
-				&workgroup,
-				&server,
-				&share,
-				&path,
-				&user,
-				&password,
-				NULL)) {
+                            context,
+                            fname,
+                            &workgroup,
+                            &server,
+                            &share,
+                            &path,
+                            &user,
+                            &password,
+                            NULL)) {
 		errno = EINVAL;
 		TALLOC_FREE(frame);
                 return -1;
         }
-
+        
 	if (!user || user[0] == (char)0) {
 		user = talloc_strdup(frame,context->config.user);
 		if (!user) {
@@ -164,15 +164,15 @@ SMBC_stat_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 (!SMBC_getatr(context, srv, path, &mode, &size,
 			 NULL,
                          &access_time_ts,
@@ -183,19 +183,19 @@ SMBC_stat_ctx(SMBCCTX *context,
 		TALLOC_FREE(frame);
 		return -1;
 	}
-
+        
 	st->st_ino = ino;
-
+        
 	setup_stat(context, st, (char *) fname, size, mode);
-
+        
 	set_atimespec(st, access_time_ts);
 	set_ctimespec(st, change_time_ts);
 	set_mtimespec(st, write_time_ts);
 	st->st_dev   = srv->dev;
-
+        
 	TALLOC_FREE(frame);
 	return 0;
-
+        
 }
 
 /*
@@ -221,41 +221,41 @@ SMBC_fstat_ctx(SMBCCTX *context,
 	struct cli_state *targetcli = NULL;
 	SMB_INO_T ino = 0;
 	TALLOC_CTX *frame = talloc_stackframe();
-
+        
 	if (!context || !context->internal->initialized) {
-
+                
 		errno = EINVAL;
 		TALLOC_FREE(frame);
 		return -1;
 	}
-
+        
 	if (!file || !SMBC_dlist_contains(context->internal->files, file)) {
 		errno = EBADF;
 		TALLOC_FREE(frame);
 		return -1;
 	}
-
+        
 	if (!file->file) {
 		TALLOC_FREE(frame);
 		return (context->posix_emu.fstatdir_fn)(context, file, st);
 	}
-
+        
 	/*d_printf(">>>fstat: parsing %s\n", file->fname);*/
 	if (SMBC_parse_path(frame,
-				context,
-				file->fname,
-				NULL,
-				&server,
-				&share,
-				&path,
-				&user,
-				&password,
-				NULL)) {
+                            context,
+                            file->fname,
+                            NULL,
+                            &server,
+                            &share,
+                            &path,
+                            &user,
+                            &password,
+                            NULL)) {
                 errno = EINVAL;
 		TALLOC_FREE(frame);
                 return -1;
         }
-
+        
 	/*d_printf(">>>fstat: resolving %s\n", path);*/
 	if (!cli_resolve_path(frame, "", file->srv->cli, path,
                               &targetcli, &targetpath)) {
@@ -264,39 +264,39 @@ SMBC_fstat_ctx(SMBCCTX *context,
 		return -1;
 	}
 	/*d_printf(">>>fstat: resolved path as %s\n", targetpath);*/
-
+        
 	if (!cli_qfileinfo(targetcli, file->cli_fd, &mode, &size,
                            NULL,
                            &access_time_ts,
                            &write_time_ts,
                            &change_time_ts,
                            &ino)) {
-
+                
 		time_t change_time, access_time, write_time;
-
+                
 		if (!cli_getattrE(targetcli, file->cli_fd, &mode, &size,
-				&change_time, &access_time, &write_time)) {
-
+                                  &change_time, &access_time, &write_time)) {
+                        
 			errno = EINVAL;
 			TALLOC_FREE(frame);
 			return -1;
 		}
-
+                
 		change_time_ts = convert_time_t_to_timespec(change_time);
 		access_time_ts = convert_time_t_to_timespec(access_time);
 		write_time_ts = convert_time_t_to_timespec(write_time);
 	}
-
+        
 	st->st_ino = ino;
-
+        
 	setup_stat(context, st, file->fname, size, mode);
-
+        
 	set_atimespec(st, access_time_ts);
 	set_ctimespec(st, change_time_ts);
 	set_mtimespec(st, write_time_ts);
 	st->st_dev = file->srv->dev;
-
+        
 	TALLOC_FREE(frame);
 	return 0;
-
+        
 }
diff --git a/source3/libsmb/libsmb_xattr.c b/source3/libsmb/libsmb_xattr.c
index a420299341..3c08412d59 100644
--- a/source3/libsmb/libsmb_xattr.c
+++ b/source3/libsmb/libsmb_xattr.c
@@ -34,16 +34,16 @@ 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 (pipe_hnd->pipe_idx == PI_LSARPC) {
 			return pipe_hnd;
 		}
 	}
-
+        
 	return NULL;
 }
 
@@ -59,19 +59,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.
@@ -87,7 +87,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);
@@ -96,7 +96,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
@@ -108,34 +108,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));
 }
 
@@ -145,10 +145,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;
@@ -175,32 +175,32 @@ 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)) ||
+                                                    pol, 1, sid, &domains,
+                                                    &names, &types)) ||
 	    !domains || !domains[0] || !names || !names[0]) {
 		TALLOC_FREE(ctx);
 		return;
 	}
-
+        
 	TALLOC_FREE(ctx);
 	/* Converted OK */
-
+        
 	slprintf(str, sizeof(fstring) - 1, "%s%s%s",
 		 domains[0], lp_winbind_separator(),
 		 names[0]);
@@ -219,31 +219,32 @@ 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, NULL, 1, &sids,
-					  &types))) {
+                                                     pol, 1, &str,
+                                                     NULL, 1, &sids,
+                                                     &types))) {
 		result = False;
 		goto done;
 	}
-
+        
 	sid_copy(sid, &sids[0]);
- done:
-
+done:
+        
 	TALLOC_FREE(ctx);
 	return result;
 }
@@ -271,7 +272,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 },
@@ -282,15 +283,15 @@ parse_ace(struct cli_state *ipc_cli,
                 { "O", 0x00080000 },
                 { NULL, 0 },
         };
-
+        
         static const struct perm_value standard_values[] = {
                 { "READ",   0x001200a9 },
                 { "CHANGE", 0x001301bf },
                 { "FULL",   0x001f01ff },
                 { NULL, 0 },
         };
-
-
+        
+        
 	ZERO_STRUCTP(ace);
 	p = strchr_m(str,':');
 	if (!p) {
@@ -300,25 +301,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) {
@@ -327,20 +328,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);
@@ -348,39 +349,39 @@ 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:
+        
+done:
 	mask = amask;
 	init_sec_ace(ace, &sid, atype, mask, aflags);
 	TALLOC_FREE(frame);
@@ -395,13 +396,14 @@ 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) {
+        
+	if ((aces = SMB_CALLOC_ARRAY(SEC_ACE,
+                                     1+(*the_acl)->num_aces)) == NULL) {
 		return False;
 	}
 	memcpy(aces, (*the_acl)->aces, (*the_acl)->num_aces * sizeof(SEC_ACE));
@@ -430,17 +432,17 @@ 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"));
+				DEBUG(5,("OWNER specified more than once!\n"));
 				goto done;
 			}
 			owner_sid = SMB_CALLOC_ARRAY(DOM_SID, 1);
@@ -453,10 +455,10 @@ sec_desc_parse(TALLOC_CTX *ctx,
 			}
 			continue;
 		}
-
+                
 		if (StrnCaseCmp(tok,"OWNER+:", 7) == 0) {
 			if (owner_sid) {
-				DEBUG(5, ("OWNER specified more than once!\n"));
+				DEBUG(5,("OWNER specified more than once!\n"));
 				goto done;
 			}
 			owner_sid = SMB_CALLOC_ARRAY(DOM_SID, 1);
@@ -469,10 +471,10 @@ sec_desc_parse(TALLOC_CTX *ctx,
 			}
 			continue;
 		}
-
+                
 		if (StrnCaseCmp(tok,"GROUP:", 6) == 0) {
 			if (group_sid) {
-				DEBUG(5, ("GROUP specified more than once!\n"));
+				DEBUG(5,("GROUP specified more than once!\n"));
 				goto done;
 			}
 			group_sid = SMB_CALLOC_ARRAY(DOM_SID, 1);
@@ -485,10 +487,10 @@ sec_desc_parse(TALLOC_CTX *ctx,
 			}
 			continue;
 		}
-
+                
 		if (StrnCaseCmp(tok,"GROUP+:", 7) == 0) {
 			if (group_sid) {
-				DEBUG(5, ("GROUP specified more than once!\n"));
+				DEBUG(5,("GROUP specified more than once!\n"));
 				goto done;
 			}
 			group_sid = SMB_CALLOC_ARRAY(DOM_SID, 1);
@@ -501,7 +503,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)) {
@@ -514,7 +516,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)) {
@@ -527,18 +529,18 @@ 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:
+        
+done:
 	SAFE_FREE(group_sid);
 	SAFE_FREE(owner_sid);
-
+        
 	return ret;
 }
 
@@ -558,13 +560,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,
@@ -577,7 +579,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);
@@ -585,7 +587,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;
 }
 
@@ -607,7 +609,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 */
@@ -622,7 +624,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 */
@@ -632,7 +634,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) {
@@ -647,30 +649,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,
@@ -680,7 +682,7 @@ dos_attr_parse(SMBCCTX *context,
 				continue;
 			}
 		}
-
+                
 		if (StrnCaseCmp(tok, "INODE:", 6) == 0) {
                         dad->inode = (SMB_INO_T)atof(tok+6);
 			continue;
@@ -757,7 +759,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 */
@@ -765,7 +767,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";
@@ -776,28 +778,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);
@@ -805,71 +807,77 @@ 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) {
-                    exclude_nt_revision = True;
-                }
-                else if (StrCaseCmp(pExclude, "nt_sec_desc.owner") == 0) {
-                    exclude_nt_owner = True;
-                }
-                else if (StrCaseCmp(pExclude, "nt_sec_desc.group") == 0) {
-                    exclude_nt_group = True;
-                }
-                else if (StrCaseCmp(pExclude, "nt_sec_desc.acl") == 0) {
-                    exclude_nt_acl = True;
-                }
-                else if (StrCaseCmp(pExclude, "dos_attr.mode") == 0) {
-                    exclude_dos_mode = True;
-                }
-                else if (StrCaseCmp(pExclude, "dos_attr.size") == 0) {
-                    exclude_dos_size = True;
-                }
-                else if (excl_attr_strings.create_time_attr != NULL &&
-                         StrCaseCmp(pExclude,
-                                    excl_attr_strings.change_time_attr) == 0) {
-                    exclude_dos_create_time = True;
-                }
-                else if (StrCaseCmp(pExclude,
-                                    excl_attr_strings.access_time_attr) == 0) {
-                    exclude_dos_access_time = True;
-                }
-                else if (StrCaseCmp(pExclude,
-                                    excl_attr_strings.write_time_attr) == 0) {
-                    exclude_dos_write_time = True;
-                }
-                else if (StrCaseCmp(pExclude,
-                                    excl_attr_strings.change_time_attr) == 0) {
-                    exclude_dos_change_time = True;
-                }
-                else if (StrCaseCmp(pExclude, "dos_attr.inode") == 0) {
-                    exclude_dos_inode = True;
-                }
-                else {
-                    DEBUG(5, ("cacl_get received unknown exclusion: %s\n",
-                              pExclude));
-                    errno = ENOATTR;
-                    return -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) {
+                                exclude_nt_revision = True;
+                        }
+                        else if (StrCaseCmp(pExclude,
+                                            "nt_sec_desc.owner") == 0) {
+                                exclude_nt_owner = True;
+                        }
+                        else if (StrCaseCmp(pExclude,
+                                            "nt_sec_desc.group") == 0) {
+                                exclude_nt_group = True;
+                        }
+                        else if (StrCaseCmp(pExclude,
+                                            "nt_sec_desc.acl") == 0) {
+                                exclude_nt_acl = True;
+                        }
+                        else if (StrCaseCmp(pExclude,
+                                            "dos_attr.mode") == 0) {
+                                exclude_dos_mode = True;
+                        }
+                        else if (StrCaseCmp(pExclude,
+                                            "dos_attr.size") == 0) {
+                                exclude_dos_size = True;
+                        }
+                        else if (excl_attr_strings.create_time_attr != NULL &&
+                                 StrCaseCmp(pExclude,
+                                            excl_attr_strings.change_time_attr) == 0) {
+                                exclude_dos_create_time = True;
+                        }
+                        else if (StrCaseCmp(pExclude,
+                                            excl_attr_strings.access_time_attr) == 0) {
+                                exclude_dos_access_time = True;
+                        }
+                        else if (StrCaseCmp(pExclude,
+                                            excl_attr_strings.write_time_attr) == 0) {
+                                exclude_dos_write_time = True;
+                        }
+                        else if (StrCaseCmp(pExclude,
+                                            excl_attr_strings.change_time_attr) == 0) {
+                                exclude_dos_change_time = True;
+                        }
+                        else if (StrCaseCmp(pExclude, "dos_attr.inode") == 0) {
+                                exclude_dos_inode = True;
+                        }
+                        else {
+                                DEBUG(5, ("cacl_get received unknown exclusion: %s\n",
+                                          pExclude));
+                                errno = ENOATTR;
+                                return -1;
+                        }
                 }
-            }
         }
-
+        
         n_used = 0;
-
+        
         /*
          * If we are (possibly) talking to an NT or new system and some NT
          * attributes have been requested...
@@ -877,28 +885,28 @@ cacl_get(SMBCCTX *context,
         if (ipc_cli && (all || some_nt || all_nt_acls)) {
                 /* Point to the portion after "system.nt_sec_desc." */
                 name += 19;     /* if (all) this will be invalid but unused */
-
+                
                 /* ... then obtain any NT attributes which were requested */
                 fnum = cli_nt_create(cli, filename, CREATE_ACCESS_READ);
-
+                
                 if (fnum == -1) {
                         DEBUG(5, ("cacl_get failed to open %s: %s\n",
                                   filename, cli_errstr(cli)));
                         errno = 0;
                         return -1;
                 }
-
+                
                 sd = cli_query_secdesc(cli, fnum, ctx);
-
+                
                 if (!sd) {
                         DEBUG(5,
                               ("cacl_get Failed to query old descriptor\n"));
                         errno = 0;
                         return -1;
                 }
-
+                
                 cli_close(cli, fnum);
-
+                
                 if (! exclude_nt_revision) {
                         if (all || all_nt) {
                                 if (determine_size) {
@@ -929,7 +937,7 @@ cacl_get(SMBCCTX *context,
                                                      sd->revision);
                                 }
                         }
-
+                        
                         if (!determine_size && n > bufsize) {
                                 errno = ERANGE;
                                 return -1;
@@ -939,7 +947,7 @@ cacl_get(SMBCCTX *context,
                         bufsize -= n;
                         n = 0;
                 }
-
+                
                 if (! exclude_nt_owner) {
                         /* Get owner and group sid */
                         if (sd->owner_sid) {
@@ -950,7 +958,7 @@ cacl_get(SMBCCTX *context,
                         } else {
                                 fstrcpy(sidstr, "");
                         }
-
+                        
                         if (all || all_nt) {
                                 if (determine_size) {
                                         p = talloc_asprintf(ctx, ",OWNER:%s",
@@ -977,7 +985,7 @@ cacl_get(SMBCCTX *context,
                                                      sidstr);
                                 }
                         }
-
+                        
                         if (!determine_size && n > bufsize) {
                                 errno = ERANGE;
                                 return -1;
@@ -987,7 +995,7 @@ cacl_get(SMBCCTX *context,
                         bufsize -= n;
                         n = 0;
                 }
-
+                
                 if (! exclude_nt_group) {
                         if (sd->group_sid) {
                                 convert_sid_to_string(ipc_cli, pol,
@@ -996,7 +1004,7 @@ cacl_get(SMBCCTX *context,
                         } else {
                                 fstrcpy(sidstr, "");
                         }
-
+                        
                         if (all || all_nt) {
                                 if (determine_size) {
                                         p = talloc_asprintf(ctx, ",GROUP:%s",
@@ -1023,7 +1031,7 @@ cacl_get(SMBCCTX *context,
                                                      "%s", sidstr);
                                 }
                         }
-
+                        
                         if (!determine_size && n > bufsize) {
                                 errno = ERANGE;
                                 return -1;
@@ -1033,16 +1041,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(
@@ -1125,15 +1133,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,
@@ -1141,17 +1149,17 @@ 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) {
@@ -1189,7 +1197,7 @@ cacl_get(SMBCCTX *context,
                                                      "0x%x", mode);
                                 }
                         }
-
+                        
                         if (!determine_size && n > bufsize) {
                                 errno = ERANGE;
                                 return -1;
@@ -1199,7 +1207,7 @@ cacl_get(SMBCCTX *context,
                         bufsize -= n;
                         n = 0;
                 }
-
+                
                 if (! exclude_dos_size) {
                         if (all || all_dos) {
                                 if (determine_size) {
@@ -1234,7 +1242,7 @@ cacl_get(SMBCCTX *context,
                                                      (double)size);
                                 }
                         }
-
+                        
                         if (!determine_size && n > bufsize) {
                                 errno = ERANGE;
                                 return -1;
@@ -1244,7 +1252,7 @@ cacl_get(SMBCCTX *context,
                         bufsize -= n;
                         n = 0;
                 }
-
+                
                 if (! exclude_dos_create_time &&
                     attr_strings.create_time_attr != NULL) {
                         if (all || all_dos) {
@@ -1277,7 +1285,7 @@ cacl_get(SMBCCTX *context,
                                                      "%lu", create_time);
                                 }
                         }
-
+                        
                         if (!determine_size && n > bufsize) {
                                 errno = ERANGE;
                                 return -1;
@@ -1287,7 +1295,7 @@ cacl_get(SMBCCTX *context,
                         bufsize -= n;
                         n = 0;
                 }
-
+                
                 if (! exclude_dos_access_time) {
                         if (all || all_dos) {
                                 if (determine_size) {
@@ -1319,7 +1327,7 @@ cacl_get(SMBCCTX *context,
                                                      "%lu", access_time);
                                 }
                         }
-
+                        
                         if (!determine_size && n > bufsize) {
                                 errno = ERANGE;
                                 return -1;
@@ -1329,7 +1337,7 @@ cacl_get(SMBCCTX *context,
                         bufsize -= n;
                         n = 0;
                 }
-
+                
                 if (! exclude_dos_write_time) {
                         if (all || all_dos) {
                                 if (determine_size) {
@@ -1361,7 +1369,7 @@ cacl_get(SMBCCTX *context,
                                                      "%lu", write_time);
                                 }
                         }
-
+                        
                         if (!determine_size && n > bufsize) {
                                 errno = ERANGE;
                                 return -1;
@@ -1371,7 +1379,7 @@ cacl_get(SMBCCTX *context,
                         bufsize -= n;
                         n = 0;
                 }
-
+                
                 if (! exclude_dos_change_time) {
                         if (all || all_dos) {
                                 if (determine_size) {
@@ -1403,7 +1411,7 @@ cacl_get(SMBCCTX *context,
                                                      "%lu", change_time);
                                 }
                         }
-
+                        
                         if (!determine_size && n > bufsize) {
                                 errno = ERANGE;
                                 return -1;
@@ -1413,7 +1421,7 @@ cacl_get(SMBCCTX *context,
                         bufsize -= n;
                         n = 0;
                 }
-
+                
                 if (! exclude_dos_inode) {
                         if (all || all_dos) {
                                 if (determine_size) {
@@ -1448,7 +1456,7 @@ cacl_get(SMBCCTX *context,
                                                      (double) ino);
                                 }
                         }
-
+                        
                         if (!determine_size && n > bufsize) {
                                 errno = ERANGE;
                                 return -1;
@@ -1458,16 +1466,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;
 }
 
@@ -1495,68 +1503,68 @@ cacl_set(TALLOC_CTX *ctx,
 	int ret = 0;
         char *p;
         bool numeric = True;
-
+        
         /* the_acl will be null for REMOVE_ALL operations */
         if (the_acl) {
                 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,
                                     CONST_DISCARD(char *, 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;
 	}
-
+        
 	/* The desired access below is the only one I could find that works
 	   with NT4, W2KP and Samba */
-
+        
 	fnum = cli_nt_create(cli, filename, CREATE_ACCESS_READ);
-
+        
 	if (fnum == -1) {
                 DEBUG(5, ("cacl_set failed to open %s: %s\n",
                           filename, cli_errstr(cli)));
                 errno = 0;
 		return -1;
 	}
-
+        
 	old = cli_query_secdesc(cli, fnum, ctx);
-
+        
 	if (!old) {
                 DEBUG(5, ("cacl_set Failed to query old descriptor\n"));
                 errno = 0;
 		return -1;
 	}
-
+        
 	cli_close(cli, fnum);
-
+        
 	switch (mode) {
 	case SMBC_XATTR_MODE_REMOVE_ALL:
                 old->dacl->num_aces = 0;
                 dacl = old->dacl;
                 break;
-
+                
         case SMBC_XATTR_MODE_REMOVE:
 		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 (sec_ace_equal(&sd->dacl->aces[i],
                                                   &old->dacl->aces[j])) {
@@ -1571,7 +1579,7 @@ cacl_set(TALLOC_CTX *ctx,
 					break;
 				}
 			}
-
+                        
 			if (!found) {
                                 err = ENOATTR;
                                 ret = -1;
@@ -1579,11 +1587,11 @@ cacl_set(TALLOC_CTX *ctx,
 			}
 		}
 		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)) {
@@ -1597,67 +1605,67 @@ cacl_set(TALLOC_CTX *ctx,
 					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);
-
+        
 	fnum = cli_nt_create(cli, filename,
                              WRITE_DAC_ACCESS | WRITE_OWNER_ACCESS);
-
+        
 	if (fnum == -1) {
 		DEBUG(5, ("cacl_set failed to open %s: %s\n",
                           filename, cli_errstr(cli)));
                 errno = 0;
 		return -1;
 	}
-
+        
 	if (!cli_set_secdesc(cli, fnum, sd)) {
 		DEBUG(5, ("ERROR: secdesc set failed: %s\n", cli_errstr(cli)));
 		ret = -1;
 	}
-
+        
 	/* Clean up */
-
- failed:
+        
+failed:
 	cli_close(cli, fnum);
-
+        
         if (err != 0) {
                 errno = err;
         }
-
+        
 	return ret;
 }
 
@@ -1688,38 +1696,38 @@ 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,
-				&workgroup,
-				&server,
-				&share,
-				&path,
-				&user,
-				&password,
-				NULL)) {
+                            context,
+                            fname,
+                            &workgroup,
+                            &server,
+                            &share,
+                            &path,
+                            &user,
+                            &password,
+                            NULL)) {
 		errno = EINVAL;
 		TALLOC_FREE(frame);
 		return -1;
         }
-
+        
 	if (!user || user[0] == (char)0) {
 		user = talloc_strdup(frame, context->config.user);
 		if (!user) {
@@ -1728,14 +1736,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);
@@ -1745,7 +1753,7 @@ SMBC_setxattr_ctx(SMBCCTX *context,
         } else {
                 ipc_srv = NULL;
         }
-
+        
         /*
          * Are they asking to set the entire set of known attributes?
          */
@@ -1761,7 +1769,7 @@ SMBC_setxattr_ctx(SMBCCTX *context,
 			TALLOC_FREE(frame);
                         return -1;
                 }
-
+                
                 if (ipc_srv) {
                         ret = cacl_set(talloc_tos(), srv->cli,
                                        ipc_srv->cli, &ipc_srv->pol, path,
@@ -1773,13 +1781,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,
@@ -1787,12 +1795,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 */
@@ -1800,11 +1808,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?
@@ -1814,12 +1822,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() */
                 }
@@ -1838,18 +1846,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() */
                 }
@@ -1864,18 +1872,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;
@@ -1891,7 +1899,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 */
@@ -1906,7 +1914,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?
          */
@@ -1917,7 +1925,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) {
@@ -1930,7 +1938,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,
@@ -1938,7 +1946,7 @@ SMBC_setxattr_ctx(SMBCCTX *context,
                                                    dad->write_time,
                                                    dad->change_time,
                                                    dad->mode);
-
+                                
                                 /* ret2 has True (success) / False (failure) */
                                 if (ret2) {
                                         ret = 0;
@@ -1949,11 +1957,11 @@ SMBC_setxattr_ctx(SMBCCTX *context,
                 } else {
                         ret = -1;
                 }
-
+                
 		TALLOC_FREE(frame);
                 return ret;
         }
-
+        
         /* Unsupported attribute name */
         errno = EINVAL;
 	TALLOC_FREE(frame);
@@ -1983,37 +1991,37 @@ 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,
-				&workgroup,
-				&server,
-				&share,
-				&path,
-				&user,
-				&password,
-				NULL)) {
+                            context,
+                            fname,
+                            &workgroup,
+                            &server,
+                            &share,
+                            &path,
+                            &user,
+                            &password,
+                            NULL)) {
 		errno = EINVAL;
 		TALLOC_FREE(frame);
 		return -1;
         }
-
+        
         if (!user || user[0] == (char)0) {
 		user = talloc_strdup(frame, context->config.user);
 		if (!user) {
@@ -2022,14 +2030,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);
@@ -2039,7 +2047,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 */
@@ -2054,7 +2062,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 ||
@@ -2081,7 +2089,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. */
                 ret = cacl_get(context, talloc_tos(), srv,
                                ipc_srv == NULL ? NULL : ipc_srv->cli, 
@@ -2094,7 +2102,7 @@ SMBC_getxattr_ctx(SMBCCTX *context,
 		TALLOC_FREE(frame);
                 return ret;
         }
-
+        
         /* Unsupported attribute name */
         errno = EINVAL;
 	TALLOC_FREE(frame);
@@ -2117,37 +2125,37 @@ 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,
-				&workgroup,
-				&server,
-				&share,
-				&path,
-				&user,
-				&password,
-				NULL)) {
+                            context,
+                            fname,
+                            &workgroup,
+                            &server,
+                            &share,
+                            &path,
+                            &user,
+                            &password,
+                            NULL)) {
 		errno = EINVAL;
 		TALLOC_FREE(frame);
 		return -1;
         }
-
+        
         if (!user || user[0] == (char)0) {
 		user = talloc_strdup(frame, context->config.user);
 		if (!user) {
@@ -2156,14 +2164,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);
@@ -2173,16 +2181,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(talloc_tos(), srv->cli,
                                ipc_srv->cli, &ipc_srv->pol, path,
@@ -2190,7 +2198,7 @@ SMBC_removexattr_ctx(SMBCCTX *context,
 		TALLOC_FREE(frame);
                 return ret;
         }
-
+        
         /*
          * Are they asking to remove one or more spceific security descriptor
          * attributes?
@@ -2202,7 +2210,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(talloc_tos(), srv->cli,
                                ipc_srv->cli, &ipc_srv->pol, path,
@@ -2210,7 +2218,7 @@ SMBC_removexattr_ctx(SMBCCTX *context,
 		TALLOC_FREE(frame);
                 return ret;
         }
-
+        
         /* Unsupported attribute name */
         errno = EINVAL;
 	TALLOC_FREE(frame);
@@ -2269,7 +2277,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);
@@ -2277,16 +2285,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;