lp_server_role() + use in srv_reg.

(This used to be commit 82e47e268ca33dd7e692c5e6d0571428307b5287)

4 files changed, 3165 insertions, 2507 deletions

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 75257e56d4..c55a51ef70 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -194,10 +194,252 @@ void CatchChildLeaveStatus(void);
 
 int vslprintf(char *str, int n, char *format, va_list ap);
 
+/*The following definitions come from  libsmb/cliconnect.c  */
+
+BOOL cli_session_setup(struct cli_state *cli, 
+		       char *user, 
+		       char *pass, int passlen,
+		       char *ntpass, int ntpasslen,
+		       char *workgroup);
+BOOL cli_ulogoff(struct cli_state *cli);
+BOOL cli_send_tconX(struct cli_state *cli, 
+		    char *share, char *dev, char *pass, int passlen);
+BOOL cli_tdis(struct cli_state *cli);
+BOOL cli_negprot(struct cli_state *cli);
+BOOL cli_session_request(struct cli_state *cli,
+			 struct nmb_name *calling, struct nmb_name *called);
+BOOL cli_connect(struct cli_state *cli, const char *host, struct in_addr *ip);
+BOOL cli_reestablish_connection(struct cli_state *cli);
+BOOL cli_establish_connection(struct cli_state *cli, 
+				char *dest_host, struct in_addr *dest_ip,
+				struct nmb_name *calling, struct nmb_name *called,
+				char *service, char *service_type,
+				BOOL do_shutdown, BOOL do_tcon);
+BOOL attempt_netbios_session_request(struct cli_state *cli, char *srchost, char *desthost,
+                                     struct in_addr *pdest_ip);
+
+/*The following definitions come from  libsmb/clientgen.c  */
+
+int cli_set_port(struct cli_state *cli, int port);
+BOOL cli_receive_smb(struct cli_state *cli);
+BOOL cli_send_smb(struct cli_state *cli);
+void cli_setup_packet(struct cli_state *cli);
+struct cli_state *cli_initialise(struct cli_state *cli);
+void cli_shutdown(struct cli_state *cli);
+void cli_sockopt(struct cli_state *cli, char *options);
+uint16 cli_setpid(struct cli_state *cli, uint16 pid);
+
+/*The following definitions come from  libsmb/clierror.c  */
+
+char *cli_errstr(struct cli_state *cli);
+int cli_error(struct cli_state *cli, uint8 *eclass, uint32 *num, uint32 *nt_rpc_error);
+
+/*The following definitions come from  libsmb/clifile.c  */
+
+BOOL cli_rename(struct cli_state *cli, char *fname_src, char *fname_dst);
+BOOL cli_unlink(struct cli_state *cli, char *fname);
+BOOL cli_mkdir(struct cli_state *cli, char *dname);
+BOOL cli_rmdir(struct cli_state *cli, char *dname);
+int cli_nt_create(struct cli_state *cli, char *fname);
+int cli_open(struct cli_state *cli, char *fname, int flags, int share_mode);
+BOOL cli_close(struct cli_state *cli, int fnum);
+BOOL cli_lock(struct cli_state *cli, int fnum, 
+	      uint32 offset, uint32 len, int timeout, enum brl_type lock_type);
+BOOL cli_unlock(struct cli_state *cli, int fnum, uint32 offset, uint32 len);
+BOOL cli_getattrE(struct cli_state *cli, int fd, 
+		  uint16 *attr, size_t *size, 
+		  time_t *c_time, time_t *a_time, time_t *m_time);
+BOOL cli_getatr(struct cli_state *cli, char *fname, 
+		uint16 *attr, size_t *size, time_t *t);
+BOOL cli_setatr(struct cli_state *cli, char *fname, uint16 attr, time_t t);
+BOOL cli_chkpath(struct cli_state *cli, char *path);
+BOOL cli_dskattr(struct cli_state *cli, int *bsize, int *total, int *avail);
+
+/*The following definitions come from  libsmb/clilist.c  */
+
+int cli_list(struct cli_state *cli,const char *Mask,uint16 attribute, 
+	     void (*fn)(file_info *, const char *));
+int cli_list_old(struct cli_state *cli,const char *Mask,uint16 attribute, 
+		 void (*fn)(file_info *, const char *));
+
+/*The following definitions come from  libsmb/climessage.c  */
+
+BOOL cli_message_start(struct cli_state *cli, char *host, char *username, 
+			      int *grp);
+BOOL cli_message_text(struct cli_state *cli, char *msg, int len, int grp);
+BOOL cli_message_end(struct cli_state *cli, int grp);
+
+/*The following definitions come from  libsmb/cliprint.c  */
+
+int cli_print_queue(struct cli_state *cli, 
+		    void (*fn)(struct print_job_info *));
+int cli_printjob_del(struct cli_state *cli, int job);
+
+/*The following definitions come from  libsmb/clirap.c  */
+
+BOOL cli_api_pipe(struct cli_state *cli, char *pipe_name, int pipe_name_len,
+                  uint16 *setup, uint32 setup_count, uint32 max_setup_count,
+                  char *params, uint32 param_count, uint32 max_param_count,
+                  char *data, uint32 data_count, uint32 max_data_count,
+                  char **rparam, uint32 *rparam_count,
+                  char **rdata, uint32 *rdata_count);
+BOOL cli_api(struct cli_state *cli,
+	     char *param, int prcnt, int mprcnt,
+	     char *data, int drcnt, int mdrcnt,
+	     char **rparam, int *rprcnt,
+	     char **rdata, int *rdrcnt);
+BOOL cli_NetWkstaUserLogon(struct cli_state *cli,char *user, char *workstation);
+int cli_RNetShareEnum(struct cli_state *cli, void (*fn)(const char *, uint32, const char *));
+BOOL cli_NetServerEnum(struct cli_state *cli, char *workgroup, uint32 stype,
+		       void (*fn)(const char *, uint32, const char *));
+BOOL cli_oem_change_password(struct cli_state *cli, const char *user, const char *new_password,
+                             const char *old_password);
+BOOL cli_qpathinfo(struct cli_state *cli, const char *fname, 
+		   time_t *c_time, time_t *a_time, time_t *m_time, 
+		   size_t *size, uint16 *mode);
+BOOL cli_qpathinfo2(struct cli_state *cli, const char *fname, 
+		    time_t *c_time, time_t *a_time, time_t *m_time, 
+		    time_t *w_time, size_t *size, uint16 *mode,
+		    SMB_INO_T *ino);
+BOOL cli_qfileinfo(struct cli_state *cli, int fnum, 
+		   uint16 *mode, size_t *size,
+		   time_t *c_time, time_t *a_time, time_t *m_time, 
+		   time_t *w_time, SMB_INO_T *ino);
+
+/*The following definitions come from  libsmb/clireadwrite.c  */
+
+size_t cli_read(struct cli_state *cli, int fnum, char *buf, off_t offset, size_t size);
+ssize_t cli_write(struct cli_state *cli,
+		  int fnum, uint16 write_mode,
+		  char *buf, off_t offset, size_t size);
+ssize_t cli_smbwrite(struct cli_state *cli,
+		     int fnum, char *buf, off_t offset, size_t size1);
+
+/*The following definitions come from  libsmb/clitrans.c  */
+
+BOOL cli_send_trans(struct cli_state *cli, int trans, 
+		    char *name, int pipe_name_len, 
+		    int fid, int flags,
+		    uint16 *setup, int lsetup, int msetup,
+		    char *param, int lparam, int mparam,
+		    char *data, int ldata, int mdata);
+BOOL cli_receive_trans(struct cli_state *cli,int trans,
+                              char **param, int *param_len,
+                              char **data, int *data_len);
+
+/*The following definitions come from  libsmb/credentials.c  */
+
+char *credstr(uchar *cred);
+void cred_session_key(DOM_CHAL *clnt_chal, DOM_CHAL *srv_chal, char *pass, 
+		      uchar session_key[8]);
+void cred_create(uchar session_key[8], DOM_CHAL *stor_cred, UTIME timestamp, 
+		 DOM_CHAL *cred);
+int cred_assert(DOM_CHAL *cred, uchar session_key[8], DOM_CHAL *stored_cred,
+		UTIME timestamp);
+BOOL clnt_deal_with_creds(uchar sess_key[8],
+			  DOM_CRED *sto_clnt_cred, DOM_CRED *rcv_srv_cred);
+BOOL deal_with_creds(uchar sess_key[8],
+		     DOM_CRED *sto_clnt_cred, 
+		     DOM_CRED *rcv_clnt_cred, DOM_CRED *rtn_srv_cred);
+
+/*The following definitions come from  libsmb/namequery.c  */
+
+BOOL name_status(int fd,char *name,int name_type,BOOL recurse,
+		 struct in_addr to_ip,char *master,char *rname);
+struct in_addr *name_query(int fd,const char *name,int name_type, 
+			   BOOL bcast,BOOL recurse,
+			   struct in_addr to_ip, int *count);
+FILE *startlmhosts(char *fname);
+BOOL getlmhostsent( FILE *fp, pstring name, int *name_type, struct in_addr *ipaddr);
+void endlmhosts(FILE *fp);
+BOOL resolve_name(const char *name, struct in_addr *return_ip, int name_type);
+BOOL find_master_ip(char *group, struct in_addr *master_ip);
+BOOL lookup_pdc_name(const char *srcname, const char *domain, struct in_addr *pdc_ip, char *ret_name);
+BOOL get_dc_list(char *group, struct in_addr **ip_list, int *count);
+
+/*The following definitions come from  libsmb/nmblib.c  */
+
+void debug_nmb_packet(struct packet_struct *p);
+char *nmb_namestr(struct nmb_name *n);
+struct packet_struct *copy_packet(struct packet_struct *packet);
+void free_packet(struct packet_struct *packet);
+struct packet_struct *parse_packet(char *buf,int length,
+				   enum packet_type packet_type);
+struct packet_struct *read_packet(int fd,enum packet_type packet_type);
+void make_nmb_name( struct nmb_name *n, const char *name, int type);
+BOOL nmb_name_equal(struct nmb_name *n1, struct nmb_name *n2);
+int build_packet(char *buf, struct packet_struct *p);
+BOOL send_packet(struct packet_struct *p);
+struct packet_struct *receive_packet(int fd,enum packet_type type,int t);
+struct packet_struct *receive_nmb_packet(int fd, int t, int trn_id);
+struct packet_struct *receive_dgram_packet(int fd, int t, char *mailslot_name);
+BOOL match_mailslot_name(struct packet_struct *p, char *mailslot_name);
+void sort_query_replies(char *data, int n, struct in_addr ip);
+char *dns_to_netbios_name(char *dns_name);
+int name_mangle( char *In, char *Out, char name_type );
+int name_extract(char *buf,int ofs,char *name);
+int name_len(char *s1);
+
+/*The following definitions come from  libsmb/nterr.c  */
+
+char *get_nt_error_msg(uint32 nt_code);
+
+/*The following definitions come from  libsmb/passchange.c  */
+
+BOOL remote_password_change(const char *remote_machine, const char *user_name, 
+			    const char *old_passwd, const char *new_passwd,
+			    char *err_str, size_t err_str_len);
+
+/*The following definitions come from  libsmb/pwd_cache.c  */
+
+void pwd_init(struct pwd_info *pwd);
+BOOL pwd_compare(struct pwd_info *pwd1, struct pwd_info *pwd2);
+void pwd_read(struct pwd_info *pwd, char *passwd_report, BOOL do_encrypt);
+void pwd_set_nullpwd(struct pwd_info *pwd);
+void pwd_set_cleartext(struct pwd_info *pwd, char *clr);
+void pwd_get_cleartext(struct pwd_info *pwd, char *clr);
+void pwd_set_lm_nt_16(struct pwd_info *pwd, uchar lm_pwd[16], uchar nt_pwd[16]);
+void pwd_get_lm_nt_16(struct pwd_info *pwd, uchar lm_pwd[16], uchar nt_pwd[16]);
+void pwd_make_lm_nt_16(struct pwd_info *pwd, char *clr);
+void pwd_make_lm_nt_owf(struct pwd_info *pwd, uchar cryptkey[8]);
+void pwd_get_lm_nt_owf(struct pwd_info *pwd, uchar lm_owf[24], uchar nt_owf[24]);
+
 /*The following definitions come from  lib/smbrun.c  */
 
 int smbrun(char *cmd,char *outfile,BOOL shared);
 
+/*The following definitions come from  libsmb/smbdes.c  */
+
+void E_P16(unsigned char *p14,unsigned char *p16);
+void E_P24(unsigned char *p21, unsigned char *c8, unsigned char *p24);
+void D_P16(unsigned char *p14, unsigned char *in, unsigned char *out);
+void E_old_pw_hash( unsigned char *p14, unsigned char *in, unsigned char *out);
+void cred_hash1(unsigned char *out,unsigned char *in,unsigned char *key);
+void cred_hash2(unsigned char *out,unsigned char *in,unsigned char *key);
+void cred_hash3(unsigned char *out,unsigned char *in,unsigned char *key, int forw);
+void SamOEMhash( unsigned char *data, unsigned char *key, int val);
+
+/*The following definitions come from  libsmb/smbencrypt.c  */
+
+void SMBencrypt(uchar *passwd, uchar *c8, uchar *p24);
+void E_md4hash(uchar *passwd, uchar *p16);
+void nt_lm_owf_gen(char *pwd, uchar nt_p16[16], uchar p16[16]);
+void SMBOWFencrypt(uchar passwd[16], uchar *c8, uchar p24[24]);
+void NTLMSSPOWFencrypt(uchar passwd[8], uchar *ntlmchalresp, uchar p24[24]);
+void SMBNTencrypt(uchar *passwd, uchar *c8, uchar *p24);
+BOOL make_oem_passwd_hash(char data[516], const char *passwd, uchar old_pw_hash[16], BOOL unicode);
+
+/*The following definitions come from  libsmb/smberr.c  */
+
+char *smb_errstr(char *inbuf);
+
+/*The following definitions come from  libsmb/unexpected.c  */
+
+void unexpected_packet(struct packet_struct *p);
+void clear_unexpected(time_t t);
+struct packet_struct *receive_unexpected(enum packet_type packet_type, int id, 
+					 char *mailslot_name);
+
 /*The following definitions come from  lib/snprintf.c  */
 
 
@@ -292,6 +534,23 @@ struct passwd *Get_Pwnam(char *user,BOOL allow_change);
 BOOL user_in_list(char *user,char *list);
 struct passwd *smb_getpwnam(char *user, BOOL allow_change);
 
+/*The following definitions come from  lib/util_array.c  */
+
+void free_void_array(uint32 num_entries, void **entries,
+		void(free_item)(void*));
+void* add_copy_to_array(uint32 *len, void ***array, const void *item,
+	void*(item_dup)(const void*), BOOL alloc_anyway);
+void* add_item_to_array(uint32 *len, void ***array, void *item);
+void free_use_info_array(uint32 num_entries, struct use_info **entries);
+struct use_info* add_use_info_to_array(uint32 *len, struct use_info ***array,
+				const struct use_info *name);
+void free_char_array(uint32 num_entries, char **entries);
+char* add_chars_to_array(uint32 *len, char ***array, const char *name);
+void free_uint32_array(uint32 num_entries, uint32 **entries);
+uint32* add_uint32s_to_array(uint32 *len, uint32 ***array, const uint32 *name);
+void free_sid_array(uint32 num_entries, DOM_SID **entries);
+DOM_SID* add_sid_to_array(uint32 *len, DOM_SID ***array, const DOM_SID *sid);
+
 /*The following definitions come from  lib/util.c  */
 
 char *tmpdir(void);
@@ -360,23 +619,6 @@ BOOL ms_has_wild(char *s);
 BOOL mask_match(char *string, char *pattern, BOOL is_case_sensitive);
 int _Insure_trap_error(int a1, int a2, int a3, int a4, int a5, int a6);
 
-/*The following definitions come from  lib/util_array.c  */
-
-void free_void_array(uint32 num_entries, void **entries,
-		void(free_item)(void*));
-void* add_copy_to_array(uint32 *len, void ***array, const void *item,
-	void*(item_dup)(const void*), BOOL alloc_anyway);
-void* add_item_to_array(uint32 *len, void ***array, void *item);
-void free_use_info_array(uint32 num_entries, struct use_info **entries);
-struct use_info* add_use_info_to_array(uint32 *len, struct use_info ***array,
-				const struct use_info *name);
-void free_char_array(uint32 num_entries, char **entries);
-char* add_chars_to_array(uint32 *len, char ***array, const char *name);
-void free_uint32_array(uint32 num_entries, uint32 **entries);
-uint32* add_uint32s_to_array(uint32 *len, uint32 ***array, const uint32 *name);
-void free_sid_array(uint32 num_entries, DOM_SID **entries);
-DOM_SID* add_sid_to_array(uint32 *len, DOM_SID ***array, const DOM_SID *sid);
-
 /*The following definitions come from  lib/util_file.c  */
 
 BOOL do_file_lock(int fd, int waitsecs, int type);
@@ -583,248 +825,6 @@ BOOL convertperms_sd_to_unix(SMB_STRUCT_STAT * psbuf, uid_t * puser,
 			     uint32 security_info_sent, SEC_DESC * psd,
 			     BOOL is_directory);
 
-/*The following definitions come from  libsmb/cliconnect.c  */
-
-BOOL cli_session_setup(struct cli_state *cli, 
-		       char *user, 
-		       char *pass, int passlen,
-		       char *ntpass, int ntpasslen,
-		       char *workgroup);
-BOOL cli_ulogoff(struct cli_state *cli);
-BOOL cli_send_tconX(struct cli_state *cli, 
-		    char *share, char *dev, char *pass, int passlen);
-BOOL cli_tdis(struct cli_state *cli);
-BOOL cli_negprot(struct cli_state *cli);
-BOOL cli_session_request(struct cli_state *cli,
-			 struct nmb_name *calling, struct nmb_name *called);
-BOOL cli_connect(struct cli_state *cli, const char *host, struct in_addr *ip);
-BOOL cli_reestablish_connection(struct cli_state *cli);
-BOOL cli_establish_connection(struct cli_state *cli, 
-				char *dest_host, struct in_addr *dest_ip,
-				struct nmb_name *calling, struct nmb_name *called,
-				char *service, char *service_type,
-				BOOL do_shutdown, BOOL do_tcon);
-BOOL attempt_netbios_session_request(struct cli_state *cli, char *srchost, char *desthost,
-                                     struct in_addr *pdest_ip);
-
-/*The following definitions come from  libsmb/clientgen.c  */
-
-int cli_set_port(struct cli_state *cli, int port);
-BOOL cli_receive_smb(struct cli_state *cli);
-BOOL cli_send_smb(struct cli_state *cli);
-void cli_setup_packet(struct cli_state *cli);
-struct cli_state *cli_initialise(struct cli_state *cli);
-void cli_shutdown(struct cli_state *cli);
-void cli_sockopt(struct cli_state *cli, char *options);
-uint16 cli_setpid(struct cli_state *cli, uint16 pid);
-
-/*The following definitions come from  libsmb/clierror.c  */
-
-char *cli_errstr(struct cli_state *cli);
-int cli_error(struct cli_state *cli, uint8 *eclass, uint32 *num, uint32 *nt_rpc_error);
-
-/*The following definitions come from  libsmb/clifile.c  */
-
-BOOL cli_rename(struct cli_state *cli, char *fname_src, char *fname_dst);
-BOOL cli_unlink(struct cli_state *cli, char *fname);
-BOOL cli_mkdir(struct cli_state *cli, char *dname);
-BOOL cli_rmdir(struct cli_state *cli, char *dname);
-int cli_nt_create(struct cli_state *cli, char *fname);
-int cli_open(struct cli_state *cli, char *fname, int flags, int share_mode);
-BOOL cli_close(struct cli_state *cli, int fnum);
-BOOL cli_lock(struct cli_state *cli, int fnum, 
-	      uint32 offset, uint32 len, int timeout, enum brl_type lock_type);
-BOOL cli_unlock(struct cli_state *cli, int fnum, uint32 offset, uint32 len);
-BOOL cli_getattrE(struct cli_state *cli, int fd, 
-		  uint16 *attr, size_t *size, 
-		  time_t *c_time, time_t *a_time, time_t *m_time);
-BOOL cli_getatr(struct cli_state *cli, char *fname, 
-		uint16 *attr, size_t *size, time_t *t);
-BOOL cli_setatr(struct cli_state *cli, char *fname, uint16 attr, time_t t);
-BOOL cli_chkpath(struct cli_state *cli, char *path);
-BOOL cli_dskattr(struct cli_state *cli, int *bsize, int *total, int *avail);
-
-/*The following definitions come from  libsmb/clilist.c  */
-
-int cli_list(struct cli_state *cli,const char *Mask,uint16 attribute, 
-	     void (*fn)(file_info *, const char *));
-int cli_list_old(struct cli_state *cli,const char *Mask,uint16 attribute, 
-		 void (*fn)(file_info *, const char *));
-
-/*The following definitions come from  libsmb/climessage.c  */
-
-BOOL cli_message_start(struct cli_state *cli, char *host, char *username, 
-			      int *grp);
-BOOL cli_message_text(struct cli_state *cli, char *msg, int len, int grp);
-BOOL cli_message_end(struct cli_state *cli, int grp);
-
-/*The following definitions come from  libsmb/cliprint.c  */
-
-int cli_print_queue(struct cli_state *cli, 
-		    void (*fn)(struct print_job_info *));
-int cli_printjob_del(struct cli_state *cli, int job);
-
-/*The following definitions come from  libsmb/clirap.c  */
-
-BOOL cli_api_pipe(struct cli_state *cli, char *pipe_name, int pipe_name_len,
-                  uint16 *setup, uint32 setup_count, uint32 max_setup_count,
-                  char *params, uint32 param_count, uint32 max_param_count,
-                  char *data, uint32 data_count, uint32 max_data_count,
-                  char **rparam, uint32 *rparam_count,
-                  char **rdata, uint32 *rdata_count);
-BOOL cli_api(struct cli_state *cli,
-	     char *param, int prcnt, int mprcnt,
-	     char *data, int drcnt, int mdrcnt,
-	     char **rparam, int *rprcnt,
-	     char **rdata, int *rdrcnt);
-BOOL cli_NetWkstaUserLogon(struct cli_state *cli,char *user, char *workstation);
-int cli_RNetShareEnum(struct cli_state *cli, void (*fn)(const char *, uint32, const char *));
-BOOL cli_NetServerEnum(struct cli_state *cli, char *workgroup, uint32 stype,
-		       void (*fn)(const char *, uint32, const char *));
-BOOL cli_oem_change_password(struct cli_state *cli, const char *user, const char *new_password,
-                             const char *old_password);
-BOOL cli_qpathinfo(struct cli_state *cli, const char *fname, 
-		   time_t *c_time, time_t *a_time, time_t *m_time, 
-		   size_t *size, uint16 *mode);
-BOOL cli_qpathinfo2(struct cli_state *cli, const char *fname, 
-		    time_t *c_time, time_t *a_time, time_t *m_time, 
-		    time_t *w_time, size_t *size, uint16 *mode,
-		    SMB_INO_T *ino);
-BOOL cli_qfileinfo(struct cli_state *cli, int fnum, 
-		   uint16 *mode, size_t *size,
-		   time_t *c_time, time_t *a_time, time_t *m_time, 
-		   time_t *w_time, SMB_INO_T *ino);
-
-/*The following definitions come from  libsmb/clireadwrite.c  */
-
-size_t cli_read(struct cli_state *cli, int fnum, char *buf, off_t offset, size_t size);
-ssize_t cli_write(struct cli_state *cli,
-		  int fnum, uint16 write_mode,
-		  char *buf, off_t offset, size_t size);
-ssize_t cli_smbwrite(struct cli_state *cli,
-		     int fnum, char *buf, off_t offset, size_t size1);
-
-/*The following definitions come from  libsmb/clitrans.c  */
-
-BOOL cli_send_trans(struct cli_state *cli, int trans, 
-		    char *name, int pipe_name_len, 
-		    int fid, int flags,
-		    uint16 *setup, int lsetup, int msetup,
-		    char *param, int lparam, int mparam,
-		    char *data, int ldata, int mdata);
-BOOL cli_receive_trans(struct cli_state *cli,int trans,
-                              char **param, int *param_len,
-                              char **data, int *data_len);
-
-/*The following definitions come from  libsmb/credentials.c  */
-
-char *credstr(uchar *cred);
-void cred_session_key(DOM_CHAL *clnt_chal, DOM_CHAL *srv_chal, char *pass, 
-		      uchar session_key[8]);
-void cred_create(uchar session_key[8], DOM_CHAL *stor_cred, UTIME timestamp, 
-		 DOM_CHAL *cred);
-int cred_assert(DOM_CHAL *cred, uchar session_key[8], DOM_CHAL *stored_cred,
-		UTIME timestamp);
-BOOL clnt_deal_with_creds(uchar sess_key[8],
-			  DOM_CRED *sto_clnt_cred, DOM_CRED *rcv_srv_cred);
-BOOL deal_with_creds(uchar sess_key[8],
-		     DOM_CRED *sto_clnt_cred, 
-		     DOM_CRED *rcv_clnt_cred, DOM_CRED *rtn_srv_cred);
-
-/*The following definitions come from  libsmb/namequery.c  */
-
-BOOL name_status(int fd,char *name,int name_type,BOOL recurse,
-		 struct in_addr to_ip,char *master,char *rname);
-struct in_addr *name_query(int fd,const char *name,int name_type, 
-			   BOOL bcast,BOOL recurse,
-			   struct in_addr to_ip, int *count);
-FILE *startlmhosts(char *fname);
-BOOL getlmhostsent( FILE *fp, pstring name, int *name_type, struct in_addr *ipaddr);
-void endlmhosts(FILE *fp);
-BOOL resolve_name(const char *name, struct in_addr *return_ip, int name_type);
-BOOL find_master_ip(char *group, struct in_addr *master_ip);
-BOOL lookup_pdc_name(const char *srcname, const char *domain, struct in_addr *pdc_ip, char *ret_name);
-BOOL get_dc_list(char *group, struct in_addr **ip_list, int *count);
-
-/*The following definitions come from  libsmb/nmblib.c  */
-
-void debug_nmb_packet(struct packet_struct *p);
-char *nmb_namestr(struct nmb_name *n);
-struct packet_struct *copy_packet(struct packet_struct *packet);
-void free_packet(struct packet_struct *packet);
-struct packet_struct *parse_packet(char *buf,int length,
-				   enum packet_type packet_type);
-struct packet_struct *read_packet(int fd,enum packet_type packet_type);
-void make_nmb_name( struct nmb_name *n, const char *name, int type);
-BOOL nmb_name_equal(struct nmb_name *n1, struct nmb_name *n2);
-int build_packet(char *buf, struct packet_struct *p);
-BOOL send_packet(struct packet_struct *p);
-struct packet_struct *receive_packet(int fd,enum packet_type type,int t);
-struct packet_struct *receive_nmb_packet(int fd, int t, int trn_id);
-struct packet_struct *receive_dgram_packet(int fd, int t, char *mailslot_name);
-BOOL match_mailslot_name(struct packet_struct *p, char *mailslot_name);
-void sort_query_replies(char *data, int n, struct in_addr ip);
-char *dns_to_netbios_name(char *dns_name);
-int name_mangle( char *In, char *Out, char name_type );
-int name_extract(char *buf,int ofs,char *name);
-int name_len(char *s1);
-
-/*The following definitions come from  libsmb/nterr.c  */
-
-char *get_nt_error_msg(uint32 nt_code);
-
-/*The following definitions come from  libsmb/passchange.c  */
-
-BOOL remote_password_change(const char *remote_machine, const char *user_name, 
-			    const char *old_passwd, const char *new_passwd,
-			    char *err_str, size_t err_str_len);
-
-/*The following definitions come from  libsmb/pwd_cache.c  */
-
-void pwd_init(struct pwd_info *pwd);
-BOOL pwd_compare(struct pwd_info *pwd1, struct pwd_info *pwd2);
-void pwd_read(struct pwd_info *pwd, char *passwd_report, BOOL do_encrypt);
-void pwd_set_nullpwd(struct pwd_info *pwd);
-void pwd_set_cleartext(struct pwd_info *pwd, char *clr);
-void pwd_get_cleartext(struct pwd_info *pwd, char *clr);
-void pwd_set_lm_nt_16(struct pwd_info *pwd, uchar lm_pwd[16], uchar nt_pwd[16]);
-void pwd_get_lm_nt_16(struct pwd_info *pwd, uchar lm_pwd[16], uchar nt_pwd[16]);
-void pwd_make_lm_nt_16(struct pwd_info *pwd, char *clr);
-void pwd_make_lm_nt_owf(struct pwd_info *pwd, uchar cryptkey[8]);
-void pwd_get_lm_nt_owf(struct pwd_info *pwd, uchar lm_owf[24], uchar nt_owf[24]);
-
-/*The following definitions come from  libsmb/smbdes.c  */
-
-void E_P16(unsigned char *p14,unsigned char *p16);
-void E_P24(unsigned char *p21, unsigned char *c8, unsigned char *p24);
-void D_P16(unsigned char *p14, unsigned char *in, unsigned char *out);
-void E_old_pw_hash( unsigned char *p14, unsigned char *in, unsigned char *out);
-void cred_hash1(unsigned char *out,unsigned char *in,unsigned char *key);
-void cred_hash2(unsigned char *out,unsigned char *in,unsigned char *key);
-void cred_hash3(unsigned char *out,unsigned char *in,unsigned char *key, int forw);
-void SamOEMhash( unsigned char *data, unsigned char *key, int val);
-
-/*The following definitions come from  libsmb/smbencrypt.c  */
-
-void SMBencrypt(uchar *passwd, uchar *c8, uchar *p24);
-void E_md4hash(uchar *passwd, uchar *p16);
-void nt_lm_owf_gen(char *pwd, uchar nt_p16[16], uchar p16[16]);
-void SMBOWFencrypt(uchar passwd[16], uchar *c8, uchar p24[24]);
-void NTLMSSPOWFencrypt(uchar passwd[8], uchar *ntlmchalresp, uchar p24[24]);
-void SMBNTencrypt(uchar *passwd, uchar *c8, uchar *p24);
-BOOL make_oem_passwd_hash(char data[516], const char *passwd, uchar old_pw_hash[16], BOOL unicode);
-
-/*The following definitions come from  libsmb/smberr.c  */
-
-char *smb_errstr(char *inbuf);
-
-/*The following definitions come from  libsmb/unexpected.c  */
-
-void unexpected_packet(struct packet_struct *p);
-void clear_unexpected(time_t t);
-struct packet_struct *receive_unexpected(enum packet_type packet_type, int id, 
-					 char *mailslot_name);
-
 /*The following definitions come from  locking/brlock.c  */
 
 void brl_init(int read_only);
@@ -911,9 +911,6 @@ BOOL queue_dns_query(struct packet_struct *p,struct nmb_name *question,
 		     struct name_record **n);
 void kill_async_dns_child(void);
 
-/*The following definitions come from  nmbd/nmbd.c  */
-
-
 /*The following definitions come from  nmbd/nmbd_become_dmb.c  */
 
 void add_domain_names(time_t t);
@@ -944,6 +941,9 @@ void announce_and_sync_with_domain_master_browser( struct subnet_record *subrec,
 void collect_all_workgroup_names_from_wins_server(time_t t);
 void sync_all_dmbs(time_t t);
 
+/*The following definitions come from  nmbd/nmbd.c  */
+
+
 /*The following definitions come from  nmbd/nmbd_elections.c  */
 
 void check_master_browser_exists(time_t t);
@@ -1249,8 +1249,6 @@ char *lp_smb_passwd_file(void);
 char *lp_serverstring(void);
 char *lp_printcapname(void);
 char *lp_lockdir(void);
-char *lp_utmpdir(void);
-char *lp_rootdir(void);
 char *lp_source_environment(void);
 char *lp_defaultservice(void);
 char *lp_msg_command(void);
@@ -1263,8 +1261,6 @@ char *lp_passwordserver(void);
 char *lp_name_resolve_order(void);
 char *lp_workgroup(void);
 char *lp_username_map(void);
-char *lp_groupname_map(void);
-char *lp_logon_script(void);
 char *lp_logon_path(void);
 char *lp_logon_drive(void);
 char *lp_logon_home(void);
@@ -1274,7 +1270,6 @@ char *lp_wins_server(void);
 char *lp_interfaces(void);
 char *lp_socket_address(void);
 char *lp_nis_home_map_name(void);
-char *lp_netbios_aliases(void);
 char *lp_driverfile(void);
 char *lp_panic_action(void);
 char *lp_adduser_script(void);
@@ -1316,9 +1311,7 @@ BOOL lp_wins_support(void);
 BOOL lp_we_are_a_wins_server(void);
 BOOL lp_wins_proxy(void);
 BOOL lp_local_master(void);
-BOOL lp_domain_master(void);
 BOOL lp_domain_logons(void);
-BOOL lp_preferred_master(void);
 BOOL lp_load_printers(void);
 BOOL lp_use_rhosts(void);
 BOOL lp_readprediction(void);
@@ -1337,7 +1330,6 @@ BOOL lp_debug_uid(void);
 BOOL lp_browse_list(void);
 BOOL lp_unix_realname(void);
 BOOL lp_nis_home_map(void);
-BOOL lp_bind_interfaces_only(void);
 BOOL lp_unix_password_sync(void);
 BOOL lp_passwd_chat_debug(void);
 BOOL lp_nt_smb_support(void);
@@ -1366,16 +1358,12 @@ int lp_maxdisksize(void);
 int lp_lpqcachetime(void);
 int lp_syslog(void);
 int lp_client_code_page(void);
-int lp_lm_announce(void);
 int lp_lm_interval(void);
 int lp_machine_password_timeout(void);
 int lp_change_notify_timeout(void);
-int lp_stat_cache_size(void);
 int lp_map_to_guest(void);
-int lp_min_passwd_length(void);
 int lp_oplock_break_wait_time(void);
 int lp_ldap_port(void);
-char *lp_preexec(int );
 char *lp_postexec(int );
 char *lp_rootpreexec(int );
 char *lp_rootpostexec(int );
@@ -1406,9 +1394,6 @@ char *lp_force_group(int );
 char *lp_readlist(int );
 char *lp_writelist(int );
 char *lp_fstype(int );
-char *lp_vfsobj(int );
-char *lp_mangled_map(int );
-char *lp_veto_files(int );
 char *lp_hide_files(int );
 char *lp_veto_oplocks(int );
 char *lp_driverlocation(int );
@@ -1478,16 +1463,20 @@ BOOL lp_do_parameter(int snum, char *pszParmName, char *pszParmValue);
 BOOL lp_is_default(int snum, struct parm_struct *parm);
 struct parm_struct *lp_next_parameter(int snum, int *i, int allparameters);
 BOOL lp_snum_ok(int iService);
-void lp_add_one_printer(char *name,char *comment);
+void lp_add_one_printer(char *name, char *comment);
 BOOL lp_loaded(void);
-void lp_killunused(BOOL (*snumused)(int ));
-BOOL lp_load(char *pszFname,BOOL global_only, BOOL save_defaults, BOOL add_ipc);
+void lp_killunused(BOOL (*snumused) (int));
+BOOL lp_load(char *pszFname, BOOL global_only, BOOL save_defaults,
+	     BOOL add_ipc);
 void lp_resetnumservices(void);
 int lp_numservices(void);
-void lp_dump(FILE *f, BOOL show_defaults, int maxtoprint);
-void lp_dump_one(FILE *f, BOOL show_defaults, int snum);
+void lp_dump(FILE * f, BOOL show_defaults, int maxtoprint);
+void lp_dump_one(FILE * f, BOOL show_defaults, int snum);
 int lp_servicenumber(char *pszServiceName);
 char *volume_label(int snum);
+int lp_server_role(void);
+BOOL lp_domain_master(void);
+BOOL lp_preferred_master(void);
 void lp_remove_service(int snum);
 void lp_copy_service(int snum, char *new_name);
 int lp_default_server_announce(void);
@@ -1643,11 +1632,6 @@ void pcap_printer_fn(void (*fn)(char *, char *));
 void cups_printer_fn(void (*fn)(char *, char *));
 int cups_printername_ok(char *name);
 
-/*The following definitions come from  printing/print_svid.c  */
-
-void sysv_printer_fn(void (*fn)(char *, char *));
-int sysv_printername_ok(char *name);
-
 /*The following definitions come from  printing/printfsp.c  */
 
 #if OLD_NTDOMAIN
@@ -1678,6 +1662,11 @@ BOOL print_queue_pause(int snum);
 BOOL print_queue_resume(int snum);
 BOOL print_queue_purge(int snum);
 
+/*The following definitions come from  printing/print_svid.c  */
+
+void sysv_printer_fn(void (*fn)(char *, char *));
+int sysv_printername_ok(char *name);
+
 /*The following definitions come from  profile/profile.c  */
 
 BOOL profile_setup(BOOL rdonly);
@@ -1731,6 +1720,47 @@ void cli_nt_set_ntlmssp_flgs(struct cli_state *cli, uint32 ntlmssp_flgs);
 BOOL cli_nt_session_open(struct cli_state *cli, char *pipe_name);
 void cli_nt_session_close(struct cli_state *cli);
 
+/*The following definitions come from  rpc_client/cli_reg.c  */
+
+BOOL do_reg_connect(struct cli_state *cli, char *full_keyname, char *key_name,
+				POLICY_HND *reg_hnd);
+BOOL do_reg_open_hklm(struct cli_state *cli, uint16 unknown_0, uint32 level,
+				POLICY_HND *hnd);
+BOOL do_reg_open_hku(struct cli_state *cli, uint16 unknown_0, uint32 level,
+				POLICY_HND *hnd);
+BOOL do_reg_flush_key(struct cli_state *cli, POLICY_HND *hnd);
+BOOL do_reg_query_key(struct cli_state *cli, POLICY_HND *hnd,
+				char *class, uint32 *class_len,
+				uint32 *num_subkeys, uint32 *max_subkeylen,
+				uint32 *max_subkeysize, uint32 *num_values,
+				uint32 *max_valnamelen, uint32 *max_valbufsize,
+				uint32 *sec_desc, NTTIME *mod_time);
+BOOL do_reg_unknown_1a(struct cli_state *cli, POLICY_HND *hnd, uint32 *unk);
+BOOL do_reg_query_info(struct cli_state *cli, POLICY_HND *hnd,
+				char *key_value, uint32* key_type);
+BOOL do_reg_set_key_sec(struct cli_state *cli, POLICY_HND *hnd, SEC_DESC_BUF *sec_desc_buf);
+BOOL do_reg_get_key_sec(struct cli_state *cli, POLICY_HND *hnd, uint32 *sec_buf_size, SEC_DESC_BUF **ppsec_desc_buf);
+BOOL do_reg_delete_val(struct cli_state *cli, POLICY_HND *hnd, char *val_name);
+BOOL do_reg_delete_key(struct cli_state *cli, POLICY_HND *hnd, char *key_name);
+BOOL do_reg_create_key(struct cli_state *cli, POLICY_HND *hnd,
+				char *key_name, char *key_class,
+				SEC_ACCESS *sam_access,
+				POLICY_HND *key);
+BOOL do_reg_enum_key(struct cli_state *cli, POLICY_HND *hnd,
+				int key_index, char *key_name,
+				uint32 *unk_1, uint32 *unk_2,
+				time_t *mod_time);
+BOOL do_reg_create_val(struct cli_state *cli, POLICY_HND *hnd,
+				char *val_name, uint32 type, BUFFER3 *data);
+BOOL do_reg_enum_val(struct cli_state *cli, POLICY_HND *hnd,
+				int val_index, int max_valnamelen, int max_valbufsize,
+				fstring val_name,
+				uint32 *val_type, BUFFER2 *value);
+BOOL do_reg_open_entry(struct cli_state *cli, POLICY_HND *hnd,
+				char *key_name, uint32 unk_0,
+				POLICY_HND *key_hnd);
+BOOL do_reg_close(struct cli_state *cli, POLICY_HND *hnd);
+
 /*The following definitions come from  rpc_client/cli_samr.c  */
 
 #if OLD_NTDOMAIN
@@ -1804,6 +1834,109 @@ BOOL do_wks_query_info(struct cli_state *cli,
 			char *server_name, uint32 switch_value,
 			WKS_INFO_100 *wks100);
 
+/*The following definitions come from  rpcclient/cmd_lsarpc.c  */
+
+void cmd_lsa_query_info(struct client_info *info);
+void cmd_lsa_lookup_sids(struct client_info *info);
+
+/*The following definitions come from  rpcclient/cmd_netlogon.c  */
+
+void cmd_netlogon_login_test(struct client_info *info);
+
+/*The following definitions come from  rpcclient/cmd_reg.c  */
+
+void cmd_reg_enum(struct client_info *info);
+void cmd_reg_query_key(struct client_info *info);
+void cmd_reg_create_val(struct client_info *info);
+void cmd_reg_delete_val(struct client_info *info);
+void cmd_reg_delete_key(struct client_info *info);
+void cmd_reg_create_key(struct client_info *info);
+void cmd_reg_test_key_sec(struct client_info *info);
+void cmd_reg_get_key_sec(struct client_info *info);
+
+/*The following definitions come from  rpcclient/cmd_samr.c  */
+
+void cmd_sam_ntchange_pwd(struct client_info *info);
+void cmd_sam_test(struct client_info *info);
+void cmd_sam_enum_users(struct client_info *info);
+void cmd_sam_query_user(struct client_info *info);
+void cmd_sam_query_groups(struct client_info *info);
+void cmd_sam_enum_aliases(struct client_info *info);
+
+/*The following definitions come from  rpcclient/cmd_srvsvc.c  */
+
+void cmd_srv_query_info(struct client_info *info);
+void cmd_srv_enum_conn(struct client_info *info);
+void cmd_srv_enum_shares(struct client_info *info);
+void cmd_srv_enum_sess(struct client_info *info);
+void cmd_srv_enum_files(struct client_info *info);
+
+/*The following definitions come from  rpcclient/cmd_wkssvc.c  */
+
+void cmd_wks_query_info(struct client_info *info);
+
+/*The following definitions come from  rpcclient/display.c  */
+
+char *get_file_mode_str(uint32 share_mode);
+char *get_file_oplock_str(uint32 op_type);
+char *get_share_type_str(uint32 type);
+char *get_server_type_str(uint32 type);
+void display_srv_info_101(FILE *out_hnd, enum action_type action,
+		SRV_INFO_101 *sv101);
+void display_srv_info_102(FILE *out_hnd, enum action_type action,SRV_INFO_102 *sv102);
+void display_srv_info_ctr(FILE *out_hnd, enum action_type action,SRV_INFO_CTR *ctr);
+void display_conn_info_0(FILE *out_hnd, enum action_type action,
+		CONN_INFO_0 *info0);
+void display_conn_info_1(FILE *out_hnd, enum action_type action,
+		CONN_INFO_1 *info1, CONN_INFO_1_STR *str1);
+void display_srv_conn_info_0_ctr(FILE *out_hnd, enum action_type action,
+				SRV_CONN_INFO_0 *ctr);
+void display_srv_conn_info_1_ctr(FILE *out_hnd, enum action_type action,
+				SRV_CONN_INFO_1 *ctr);
+void display_srv_conn_info_ctr(FILE *out_hnd, enum action_type action,
+				SRV_CONN_INFO_CTR *ctr);
+void display_share_info_1(FILE *out_hnd, enum action_type action,
+			  SRV_SHARE_INFO_1 *info1);
+void display_share_info_2(FILE *out_hnd, enum action_type action,
+			  SRV_SHARE_INFO_2 *info2);
+void display_srv_share_info_ctr(FILE *out_hnd, enum action_type action,
+				SRV_SHARE_INFO_CTR *ctr);
+void display_file_info_3(FILE *out_hnd, enum action_type action,
+		FILE_INFO_3 *info3, FILE_INFO_3_STR *str3);
+void display_srv_file_info_3_ctr(FILE *out_hnd, enum action_type action,
+				SRV_FILE_INFO_3 *ctr);
+void display_srv_file_info_ctr(FILE *out_hnd, enum action_type action,
+				SRV_FILE_INFO_CTR *ctr);
+void display_server(FILE *out_hnd, enum action_type action,
+				char *sname, uint32 type, char *comment);
+void display_share(FILE *out_hnd, enum action_type action,
+				char *sname, uint32 type, char *comment);
+void display_share2(FILE *out_hnd, enum action_type action,
+				char *sname, uint32 type, char *comment,
+				uint32 perms, uint32 max_uses, uint32 num_uses,
+				char *path, char *passwd);
+void display_name(FILE *out_hnd, enum action_type action,
+				char *sname);
+void display_group_rid_info(FILE *out_hnd, enum action_type action,
+				uint32 num_gids, DOM_GID *gid);
+void display_alias_name_info(FILE *out_hnd, enum action_type action,
+				uint32 num_aliases, fstring *alias_name, uint32 *num_als_usrs);
+void display_sam_user_info_21(FILE *out_hnd, enum action_type action, SAM_USER_INFO_21 *usr);
+char *get_sec_mask_str(uint32 type);
+void display_sec_access(FILE *out_hnd, enum action_type action, SEC_ACCESS *info);
+void display_sec_ace(FILE *out_hnd, enum action_type action, SEC_ACE *ace);
+void display_sec_acl(FILE *out_hnd, enum action_type action, SEC_ACL *sec_acl);
+void display_sec_desc(FILE *out_hnd, enum action_type action, SEC_DESC *sec);
+char *get_reg_val_type_str(uint32 type);
+void display_reg_value_info(FILE *out_hnd, enum action_type action,
+				char *val_name, uint32 val_type, BUFFER2 *value);
+void display_reg_key_info(FILE *out_hnd, enum action_type action,
+				char *key_name, time_t key_mod_time);
+
+/*The following definitions come from  rpcclient/rpcclient.c  */
+
+void rpcclient_init(void);
+
 /*The following definitions come from  rpc_parse/parse_creds.c  */
 
 BOOL make_creds_unix(CREDS_UNIX *r_u, const char* user_name,
@@ -1938,7 +2071,7 @@ BOOL smb_io_hdrbuf_post(char *desc, BUFHDR *hdr, prs_struct *ps, int depth,
 BOOL smb_io_hdrbuf(char *desc, BUFHDR *hdr, prs_struct *ps, int depth);
 void init_uni_hdr2(UNIHDR2 *hdr, int len);
 BOOL smb_io_unihdr2(char *desc, UNIHDR2 *hdr2, prs_struct *ps, int depth);
-void init_unistr(UNISTR *str, const char *buf);
+void init_unistr(UNISTR *str, char *buf);
 BOOL smb_io_unistr(char *desc, UNISTR *uni, prs_struct *ps, int depth);
 void init_buffer3_uint32(BUFFER3 *str, uint32 val);
 void init_buffer3_str(BUFFER3 *str, char *buf, int len);
@@ -2914,109 +3047,6 @@ uint32 lookup_user_rid(char *user_name, uint32 *rid);
 BOOL api_wkssvc_rpc(pipes_struct *p, prs_struct *data);
 #endif
 
-/*The following definitions come from  rpcclient/cmd_lsarpc.c  */
-
-void cmd_lsa_query_info(struct client_info *info);
-void cmd_lsa_lookup_sids(struct client_info *info);
-
-/*The following definitions come from  rpcclient/cmd_netlogon.c  */
-
-void cmd_netlogon_login_test(struct client_info *info);
-
-/*The following definitions come from  rpcclient/cmd_reg.c  */
-
-void cmd_reg_enum(struct client_info *info);
-void cmd_reg_query_key(struct client_info *info);
-void cmd_reg_create_val(struct client_info *info);
-void cmd_reg_delete_val(struct client_info *info);
-void cmd_reg_delete_key(struct client_info *info);
-void cmd_reg_create_key(struct client_info *info);
-void cmd_reg_test_key_sec(struct client_info *info);
-void cmd_reg_get_key_sec(struct client_info *info);
-
-/*The following definitions come from  rpcclient/cmd_samr.c  */
-
-void cmd_sam_ntchange_pwd(struct client_info *info);
-void cmd_sam_test(struct client_info *info);
-void cmd_sam_enum_users(struct client_info *info);
-void cmd_sam_query_user(struct client_info *info);
-void cmd_sam_query_groups(struct client_info *info);
-void cmd_sam_enum_aliases(struct client_info *info);
-
-/*The following definitions come from  rpcclient/cmd_srvsvc.c  */
-
-void cmd_srv_query_info(struct client_info *info);
-void cmd_srv_enum_conn(struct client_info *info);
-void cmd_srv_enum_shares(struct client_info *info);
-void cmd_srv_enum_sess(struct client_info *info);
-void cmd_srv_enum_files(struct client_info *info);
-
-/*The following definitions come from  rpcclient/cmd_wkssvc.c  */
-
-void cmd_wks_query_info(struct client_info *info);
-
-/*The following definitions come from  rpcclient/display.c  */
-
-char *get_file_mode_str(uint32 share_mode);
-char *get_file_oplock_str(uint32 op_type);
-char *get_share_type_str(uint32 type);
-char *get_server_type_str(uint32 type);
-void display_srv_info_101(FILE *out_hnd, enum action_type action,
-		SRV_INFO_101 *sv101);
-void display_srv_info_102(FILE *out_hnd, enum action_type action,SRV_INFO_102 *sv102);
-void display_srv_info_ctr(FILE *out_hnd, enum action_type action,SRV_INFO_CTR *ctr);
-void display_conn_info_0(FILE *out_hnd, enum action_type action,
-		CONN_INFO_0 *info0);
-void display_conn_info_1(FILE *out_hnd, enum action_type action,
-		CONN_INFO_1 *info1, CONN_INFO_1_STR *str1);
-void display_srv_conn_info_0_ctr(FILE *out_hnd, enum action_type action,
-				SRV_CONN_INFO_0 *ctr);
-void display_srv_conn_info_1_ctr(FILE *out_hnd, enum action_type action,
-				SRV_CONN_INFO_1 *ctr);
-void display_srv_conn_info_ctr(FILE *out_hnd, enum action_type action,
-				SRV_CONN_INFO_CTR *ctr);
-void display_share_info_1(FILE *out_hnd, enum action_type action,
-			  SRV_SHARE_INFO_1 *info1);
-void display_share_info_2(FILE *out_hnd, enum action_type action,
-			  SRV_SHARE_INFO_2 *info2);
-void display_srv_share_info_ctr(FILE *out_hnd, enum action_type action,
-				SRV_SHARE_INFO_CTR *ctr);
-void display_file_info_3(FILE *out_hnd, enum action_type action,
-		FILE_INFO_3 *info3, FILE_INFO_3_STR *str3);
-void display_srv_file_info_3_ctr(FILE *out_hnd, enum action_type action,
-				SRV_FILE_INFO_3 *ctr);
-void display_srv_file_info_ctr(FILE *out_hnd, enum action_type action,
-				SRV_FILE_INFO_CTR *ctr);
-void display_server(FILE *out_hnd, enum action_type action,
-				char *sname, uint32 type, char *comment);
-void display_share(FILE *out_hnd, enum action_type action,
-				char *sname, uint32 type, char *comment);
-void display_share2(FILE *out_hnd, enum action_type action,
-				char *sname, uint32 type, char *comment,
-				uint32 perms, uint32 max_uses, uint32 num_uses,
-				char *path, char *passwd);
-void display_name(FILE *out_hnd, enum action_type action,
-				char *sname);
-void display_group_rid_info(FILE *out_hnd, enum action_type action,
-				uint32 num_gids, DOM_GID *gid);
-void display_alias_name_info(FILE *out_hnd, enum action_type action,
-				uint32 num_aliases, fstring *alias_name, uint32 *num_als_usrs);
-void display_sam_user_info_21(FILE *out_hnd, enum action_type action, SAM_USER_INFO_21 *usr);
-char *get_sec_mask_str(uint32 type);
-void display_sec_access(FILE *out_hnd, enum action_type action, SEC_ACCESS *info);
-void display_sec_ace(FILE *out_hnd, enum action_type action, SEC_ACE *ace);
-void display_sec_acl(FILE *out_hnd, enum action_type action, SEC_ACL *sec_acl);
-void display_sec_desc(FILE *out_hnd, enum action_type action, SEC_DESC *sec);
-char *get_reg_val_type_str(uint32 type);
-void display_reg_value_info(FILE *out_hnd, enum action_type action,
-				char *val_name, uint32 val_type, BUFFER2 *value);
-void display_reg_key_info(FILE *out_hnd, enum action_type action,
-				char *key_name, time_t key_mod_time);
-
-/*The following definitions come from  rpcclient/rpcclient.c  */
-
-void rpcclient_init(void);
-
 /*The following definitions come from  smbd/blocking.c  */
 
 #if OLD_NTDOMAIN
@@ -3465,6 +3495,19 @@ void become_root(BOOL save_dir) ;
 void unbecome_root(BOOL restore_dir);
 #endif
 
+/*The following definitions come from  smbd/vfs.c  */
+
+int vfs_init_default(connection_struct *conn);
+BOOL vfs_init_custom(connection_struct *conn);
+BOOL vfs_directory_exist(connection_struct *conn, char *dname,
+                         SMB_STRUCT_STAT *st);
+BOOL vfs_file_exist(connection_struct *conn,char *fname,SMB_STRUCT_STAT *sbuf);
+ssize_t vfs_write_data(files_struct *fsp,char *buffer,size_t N);
+SMB_OFF_T vfs_transfer_file(int in_fd, files_struct *in_fsp, 
+			    int out_fd, files_struct *out_fsp,
+			    SMB_OFF_T n, char *header, int headlen, int align);
+char *vfs_readdirname(connection_struct *conn, void *p);
+
 /*The following definitions come from  smbd/vfs-wrap.c  */
 
 int vfswrap_dummy_connect(struct vfs_connection_struct *conn, char *service,
@@ -3494,19 +3537,6 @@ int vfswrap_utime(char *path, struct utimbuf *times);
 int vfswrap_ftruncate(int fd, SMB_OFF_T offset);
 BOOL vfswrap_lock(int fd, int op, SMB_OFF_T offset, SMB_OFF_T count, int type);
 
-/*The following definitions come from  smbd/vfs.c  */
-
-int vfs_init_default(connection_struct *conn);
-BOOL vfs_init_custom(connection_struct *conn);
-BOOL vfs_directory_exist(connection_struct *conn, char *dname,
-                         SMB_STRUCT_STAT *st);
-BOOL vfs_file_exist(connection_struct *conn,char *fname,SMB_STRUCT_STAT *sbuf);
-ssize_t vfs_write_data(files_struct *fsp,char *buffer,size_t N);
-SMB_OFF_T vfs_transfer_file(int in_fd, files_struct *in_fsp, 
-			    int out_fd, files_struct *out_fsp,
-			    SMB_OFF_T n, char *header, int headlen, int align);
-char *vfs_readdirname(connection_struct *conn, void *p);
-
 /*The following definitions come from  smbwrapper/realcalls.c  */
 
 int real_utime(const char *name, struct utimbuf *buf);
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 993d7626ef..e2ce652608 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -34,6 +34,7 @@
 
 #define False (0)
 #define True (1)
+#define Auto (2)
 
 #ifndef _BOOL
 typedef int BOOL;
@@ -1461,6 +1462,15 @@ enum protocol_types {PROTOCOL_NONE,PROTOCOL_CORE,PROTOCOL_COREPLUS,PROTOCOL_LANM
 /* security levels */
 enum security_types {SEC_SHARE,SEC_USER,SEC_SERVER,SEC_DOMAIN};
 
+/* server roles */
+enum server_types
+{
+	ROLE_STANDALONE,
+	ROLE_DOMAIN_MEMBER,
+	ROLE_DOMAIN_BDC,
+	ROLE_DOMAIN_PDC
+};
+
 /* printing types */
 enum printing_types {PRINT_BSD,PRINT_SYSV,PRINT_AIX,PRINT_HPUX,
 		     PRINT_QNX,PRINT_PLP,PRINT_LPRNG,PRINT_SOFTQ,PRINT_CUPS};
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index f058dead2f..57f93095a2 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -65,7 +65,7 @@
 #define KANJI "sbcs"
 #endif /* KANJI */
 
-BOOL in_client = False;   /* Not in the client by default */
+BOOL in_client = False;		/* Not in the client by default */
 BOOL bLoaded = False;
 
 extern int DEBUGLEVEL;
@@ -91,173 +91,174 @@ pstring global_scope = "";
 #define LP_SNUM_OK(iService) (((iService) >= 0) && ((iService) < iNumServices) && iSERVICE(iService).valid)
 #define VALID(i) iSERVICE(i).valid
 
-int keepalive=DEFAULT_KEEPALIVE;
+int keepalive = DEFAULT_KEEPALIVE;
 extern BOOL use_getwd_cache;
 
 extern int extra_time_offset;
 
-static BOOL defaults_saved=False;
+static BOOL defaults_saved = False;
 
 /* 
  * This structure describes global (ie., server-wide) parameters.
  */
 typedef struct
 {
-  char *szPrintcapname;
-  char *szLockDir;
-  char *szRootdir;
-  char *szDefaultService;
-  char *szDfree;
-  char *szMsgCommand;
-  char *szHostsEquiv;
-  char *szServerString;
-  char *szAutoServices;
-  char *szPasswdProgram;
-  char *szPasswdChat;
-  char *szLogFile;
-  char *szConfigFile;
-  char *szSMBPasswdFile;
-  char *szPasswordServer;
-  char *szSocketOptions;
-  char *szValidChars;
-  char *szWorkGroup;
-  char *szDomainAdminGroup;
-  char *szDomainGuestGroup;
-  char *szDomainAdminUsers;
-  char *szDomainGuestUsers;
-  char *szDomainHostsallow; 
-  char *szDomainHostsdeny;
-  char *szUsernameMap;
+	char *szPrintcapname;
+	char *szLockDir;
+	char *szRootdir;
+	char *szDefaultService;
+	char *szDfree;
+	char *szMsgCommand;
+	char *szHostsEquiv;
+	char *szServerString;
+	char *szAutoServices;
+	char *szPasswdProgram;
+	char *szPasswdChat;
+	char *szLogFile;
+	char *szConfigFile;
+	char *szSMBPasswdFile;
+	char *szPasswordServer;
+	char *szSocketOptions;
+	char *szValidChars;
+	char *szWorkGroup;
+	char *szDomainAdminGroup;
+	char *szDomainGuestGroup;
+	char *szDomainAdminUsers;
+	char *szDomainGuestUsers;
+	char *szDomainHostsallow;
+	char *szDomainHostsdeny;
+	char *szUsernameMap;
 #ifdef USING_GROUPNAME_MAP
-  char *szGroupnameMap;
-#endif /* USING_GROUPNAME_MAP */
-  char *szCharacterSet;
-  char *szLogonScript;
-  char *szLogonPath;
-  char *szLogonDrive;
-  char *szLogonHome;
-  char *szSmbrun;
-  char *szWINSserver;
-  char *szCodingSystem;
-  char *szInterfaces;
-  char *szRemoteAnnounce;
-  char *szRemoteBrowseSync;
-  char *szSocketAddress;
-  char *szNISHomeMapName;
-  char *szAnnounceVersion; /* This is initialised in init_globals */
-  char *szNetbiosAliases;
-  char *szDomainOtherSIDs;
-  char *szDomainGroups;
-  char *szDriverFile;
-  char *szNameResolveOrder;
-  char *szLdapServer;
-  char *szLdapSuffix;
-  char *szLdapFilter;
-  char *szLdapRoot;
-  char *szLdapRootPassword; 
-  char *szPanicAction;
-  char *szAddUserScript;
-  char *szDelUserScript;
-  char *szWINSHook;
-  char *szNtForms;
-  char *szNtDriverFile;    
+	char *szGroupnameMap;
+#endif				/* USING_GROUPNAME_MAP */
+	char *szCharacterSet;
+	char *szLogonScript;
+	char *szLogonPath;
+	char *szLogonDrive;
+	char *szLogonHome;
+	char *szSmbrun;
+	char *szWINSserver;
+	char *szCodingSystem;
+	char *szInterfaces;
+	char *szRemoteAnnounce;
+	char *szRemoteBrowseSync;
+	char *szSocketAddress;
+	char *szNISHomeMapName;
+	char *szAnnounceVersion;	/* This is initialised in init_globals */
+	char *szNetbiosAliases;
+	char *szDomainOtherSIDs;
+	char *szDomainGroups;
+	char *szDriverFile;
+	char *szNameResolveOrder;
+	char *szLdapServer;
+	char *szLdapSuffix;
+	char *szLdapFilter;
+	char *szLdapRoot;
+	char *szLdapRootPassword;
+	char *szPanicAction;
+	char *szAddUserScript;
+	char *szDelUserScript;
+	char *szWINSHook;
+	char *szNtForms;
+	char *szNtDriverFile;
 #ifdef WITH_UTMP
-  char *szUtmpDir;
-#endif /* WITH_UTMP */
-  char *szSourceEnv;
-  char *szWinbindUID;
-  char *szWinbindGID;
-  char *szTemplateHomedir;
-  char *szTemplateShell;
-  char *szWinbindSeparator;
-  int max_log_size;
-  int mangled_stack;
-  int max_xmit;
-  int max_mux;
-  int max_open_files;
-  int max_packet;
-  int pwordlevel;
-  int unamelevel;
-  int deadtime;
-  int maxprotocol;
-  int security;
-  int maxdisksize;
-  int lpqcachetime;
-  int syslog;
-  int os_level;
-  int max_ttl;
-  int max_wins_ttl;
-  int min_wins_ttl;
-  int ReadSize;
-  int lm_announce;
-  int lm_interval;
-  int shmem_size;
-  int client_code_page;
-  int announce_as;   /* This is initialised in init_globals */
-  int machine_password_timeout;
-  int change_notify_timeout;
-  int stat_cache_size;
-  int map_to_guest;
-  int min_passwd_length;
-  int oplock_break_wait_time;
-  int winbind_cache_time;
+	char *szUtmpDir;
+#endif				/* WITH_UTMP */
+	char *szSourceEnv;
+	char *szWinbindUID;
+	char *szWinbindGID;
+	char *szTemplateHomedir;
+	char *szTemplateShell;
+	char *szWinbindSeparator;
+	int max_log_size;
+	int mangled_stack;
+	int max_xmit;
+	int max_mux;
+	int max_open_files;
+	int max_packet;
+	int pwordlevel;
+	int unamelevel;
+	int deadtime;
+	int maxprotocol;
+	int security;
+	int maxdisksize;
+	int lpqcachetime;
+	int syslog;
+	int os_level;
+	int max_ttl;
+	int max_wins_ttl;
+	int min_wins_ttl;
+	int ReadSize;
+	int lm_announce;
+	int lm_interval;
+	int shmem_size;
+	int client_code_page;
+	int announce_as;	/* This is initialised in init_globals */
+	int machine_password_timeout;
+	int change_notify_timeout;
+	int stat_cache_size;
+	int map_to_guest;
+	int min_passwd_length;
+	int oplock_break_wait_time;
+	int winbind_cache_time;
 #ifdef WITH_LDAP
-  int ldap_port;
-#endif /* WITH_LDAP */
+	int ldap_port;
+#endif				/* WITH_LDAP */
 #ifdef WITH_SSL
-  int sslVersion;
-  char *sslHostsRequire;
-  char *sslHostsResign;
-  char *sslCaCertDir;
-  char *sslCaCertFile;
-  char *sslCert;
-  char *sslPrivKey;
-  char *sslClientCert;
-  char *sslClientPrivKey;
-  char *sslCiphers;
-  BOOL sslEnabled;
-  BOOL sslReqClientCert;
-  BOOL sslReqServerCert;
-  BOOL sslCompatibility;
-#endif /* WITH_SSL */
-  BOOL bDNSproxy;
-  BOOL bWINSsupport;
-  BOOL bWINSproxy;
-  BOOL bLocalMaster;
-  BOOL bPreferredMaster;
-  BOOL bDomainMaster;
-  BOOL bDomainLogons;
-  BOOL bEncryptPasswords;
-  BOOL bUpdateEncrypt;
-  BOOL bStripDot;
-  BOOL bNullPasswords;
-  BOOL bLoadPrinters;
-  BOOL bUseRhosts;
-  BOOL bReadRaw;
-  BOOL bWriteRaw;
-  BOOL bReadPrediction;
-  BOOL bReadbmpx;
-  BOOL bSyslogOnly;
-  BOOL bBrowseList;
-  BOOL bUnixRealname;
-  BOOL bNISHomeMap;
-  BOOL bTimeServer;
-  BOOL bBindInterfacesOnly;
-  BOOL bUnixPasswdSync;
-  BOOL bPasswdChatDebug;
-  BOOL bTimestampLogs;
-  BOOL bNTSmbSupport;
-  BOOL bNTPipeSupport;
-  BOOL bNTAclSupport;
-  BOOL bStatCache;
-  BOOL bKernelOplocks;
-  BOOL bAllowTrustedDomains;
-  BOOL bRestrictAnonymous;
-  BOOL bDebugHiresTimestamp;
-  BOOL bDebugPid;
-  BOOL bDebugUid;
-  BOOL bHostMSDfs;
-} global;
+	int sslVersion;
+	char *sslHostsRequire;
+	char *sslHostsResign;
+	char *sslCaCertDir;
+	char *sslCaCertFile;
+	char *sslCert;
+	char *sslPrivKey;
+	char *sslClientCert;
+	char *sslClientPrivKey;
+	char *sslCiphers;
+	BOOL sslEnabled;
+	BOOL sslReqClientCert;
+	BOOL sslReqServerCert;
+	BOOL sslCompatibility;
+#endif				/* WITH_SSL */
+	BOOL bDNSproxy;
+	BOOL bWINSsupport;
+	BOOL bWINSproxy;
+	BOOL bLocalMaster;
+	BOOL bPreferredMaster;
+	BOOL bDomainMaster;
+	BOOL bDomainLogons;
+	BOOL bEncryptPasswords;
+	BOOL bUpdateEncrypt;
+	BOOL bStripDot;
+	BOOL bNullPasswords;
+	BOOL bLoadPrinters;
+	BOOL bUseRhosts;
+	BOOL bReadRaw;
+	BOOL bWriteRaw;
+	BOOL bReadPrediction;
+	BOOL bReadbmpx;
+	BOOL bSyslogOnly;
+	BOOL bBrowseList;
+	BOOL bUnixRealname;
+	BOOL bNISHomeMap;
+	BOOL bTimeServer;
+	BOOL bBindInterfacesOnly;
+	BOOL bUnixPasswdSync;
+	BOOL bPasswdChatDebug;
+	BOOL bTimestampLogs;
+	BOOL bNTSmbSupport;
+	BOOL bNTPipeSupport;
+	BOOL bNTAclSupport;
+	BOOL bStatCache;
+	BOOL bKernelOplocks;
+	BOOL bAllowTrustedDomains;
+	BOOL bRestrictAnonymous;
+	BOOL bDebugHiresTimestamp;
+	BOOL bDebugPid;
+	BOOL bDebugUid;
+	BOOL bHostMSDfs;
+}
+global;
 
 static global Globals;
 
@@ -268,222 +269,222 @@ static global Globals;
  */
 typedef struct
 {
-  BOOL valid;
-  BOOL autoloaded;
-  char *szService;
-  char *szPath;
-  char *szUsername;
-  char *szGuestaccount;
-  char *szInvalidUsers;
-  char *szValidUsers;
-  char *szAdminUsers;
-  char *szCopy;
-  char *szInclude;
-  char *szPreExec;
-  char *szPostExec;
-  char *szRootPreExec;
-  char *szRootPostExec;
-  char *szPrintcommand;
-  char *szLpqcommand;
-  char *szLprmcommand;
-  char *szLppausecommand;
-  char *szLpresumecommand;
-  char *szQueuepausecommand;
-  char *szQueueresumecommand;
-  char *szPrintername;
-  char *szPrinterDriver;
-  char *szPrinterDriverLocation;
-  char *szDontdescend;
-  char *szHostsallow;
-  char *szHostsdeny;
-  char *szMagicScript;
-  char *szMagicOutput;
-  char *szMangledMap;
-  char *szVetoFiles;
-  char *szHideFiles;
-  char *szVetoOplockFiles;
-  char *comment;
-  char *force_user;
-  char *force_group;
-  char *readlist;
-  char *writelist;
-  char *volume;
-  char *fstype;
-  char *szVfsObjectFile;
-  char *szVfsOptions;
-  int  iMinPrintSpace;
-  int  iWriteCacheSize;
-  int  iCreate_mask;
-  int  iCreate_force_mode;
-  int  iSecurity_mask;
-  int  iSecurity_force_mode;
-  int  iDir_mask;
-  int  iDir_force_mode;
-  int  iDir_Security_mask;
-  int  iDir_Security_force_mode;
-  int  iMaxConnections;
-  int  iDefaultCase;
-  int  iPrinting;
-  int  iOplockContentionLimit;
-  BOOL bAlternatePerm;
-  BOOL bPreexecClose;
-  BOOL bRootpreexecClose;
-  BOOL bCaseSensitive;
-  BOOL bCasePreserve;
-  BOOL bShortCasePreserve;
-  BOOL bCaseMangle;
-  BOOL status;
-  BOOL bHideDotFiles;
-  BOOL bBrowseable;
-  BOOL bAvailable;
-  BOOL bRead_only;
-  BOOL bNo_set_dir;
-  BOOL bGuest_only;
-  BOOL bGuest_ok;
-  BOOL bPrint_ok;
-  BOOL bPostscript;
-  BOOL bMap_system;
-  BOOL bMap_hidden;
-  BOOL bMap_archive;
-  BOOL bLocking;
-  BOOL bStrictLocking;
-  BOOL bPosixLocking;
+	BOOL valid;
+	BOOL autoloaded;
+	char *szService;
+	char *szPath;
+	char *szUsername;
+	char *szGuestaccount;
+	char *szInvalidUsers;
+	char *szValidUsers;
+	char *szAdminUsers;
+	char *szCopy;
+	char *szInclude;
+	char *szPreExec;
+	char *szPostExec;
+	char *szRootPreExec;
+	char *szRootPostExec;
+	char *szPrintcommand;
+	char *szLpqcommand;
+	char *szLprmcommand;
+	char *szLppausecommand;
+	char *szLpresumecommand;
+	char *szQueuepausecommand;
+	char *szQueueresumecommand;
+	char *szPrintername;
+	char *szPrinterDriver;
+	char *szPrinterDriverLocation;
+	char *szDontdescend;
+	char *szHostsallow;
+	char *szHostsdeny;
+	char *szMagicScript;
+	char *szMagicOutput;
+	char *szMangledMap;
+	char *szVetoFiles;
+	char *szHideFiles;
+	char *szVetoOplockFiles;
+	char *comment;
+	char *force_user;
+	char *force_group;
+	char *readlist;
+	char *writelist;
+	char *volume;
+	char *fstype;
+	char *szVfsObjectFile;
+	char *szVfsOptions;
+	int iMinPrintSpace;
+	int iWriteCacheSize;
+	int iCreate_mask;
+	int iCreate_force_mode;
+	int iSecurity_mask;
+	int iSecurity_force_mode;
+	int iDir_mask;
+	int iDir_force_mode;
+	int iDir_Security_mask;
+	int iDir_Security_force_mode;
+	int iMaxConnections;
+	int iDefaultCase;
+	int iPrinting;
+	int iOplockContentionLimit;
+	BOOL bAlternatePerm;
+	BOOL bPreexecClose;
+	BOOL bRootpreexecClose;
+	BOOL bCaseSensitive;
+	BOOL bCasePreserve;
+	BOOL bShortCasePreserve;
+	BOOL bCaseMangle;
+	BOOL status;
+	BOOL bHideDotFiles;
+	BOOL bBrowseable;
+	BOOL bAvailable;
+	BOOL bRead_only;
+	BOOL bNo_set_dir;
+	BOOL bGuest_only;
+	BOOL bGuest_ok;
+	BOOL bPrint_ok;
+	BOOL bPostscript;
+	BOOL bMap_system;
+	BOOL bMap_hidden;
+	BOOL bMap_archive;
+	BOOL bLocking;
+	BOOL bStrictLocking;
+	BOOL bPosixLocking;
 #ifdef WITH_UTMP
-  BOOL bUtmp;
+	BOOL bUtmp;
 #endif
-  BOOL bShareModes;
-  BOOL bOpLocks;
-  BOOL bLevel2OpLocks;
-  BOOL bOnlyUser;
-  BOOL bMangledNames;
-  BOOL bWidelinks;
-  BOOL bSymlinks;
-  BOOL bSyncAlways;
-  BOOL bStrictSync;
-  char magic_char;
-  BOOL *copymap;
-  BOOL bDeleteReadonly;
-  BOOL bFakeOplocks;
-  BOOL bDeleteVetoFiles;
-  BOOL bDosFiletimes;
-  BOOL bDosFiletimeResolution;
-  BOOL bFakeDirCreateTimes;
-  BOOL bBlockingLocks;
-  BOOL bInheritPerms; 
-  BOOL bMSDfsRoot;
-
-  char dummy[3]; /* for alignment */
-} service;
+	BOOL bShareModes;
+	BOOL bOpLocks;
+	BOOL bLevel2OpLocks;
+	BOOL bOnlyUser;
+	BOOL bMangledNames;
+	BOOL bWidelinks;
+	BOOL bSymlinks;
+	BOOL bSyncAlways;
+	BOOL bStrictSync;
+	char magic_char;
+	BOOL *copymap;
+	BOOL bDeleteReadonly;
+	BOOL bFakeOplocks;
+	BOOL bDeleteVetoFiles;
+	BOOL bDosFiletimes;
+	BOOL bDosFiletimeResolution;
+	BOOL bFakeDirCreateTimes;
+	BOOL bBlockingLocks;
+	BOOL bInheritPerms;
+	BOOL bMSDfsRoot;
+
+	char dummy[3];		/* for alignment */
+}
+service;
 
 
 /* This is a default service used to prime a services structure */
-static service sDefault = 
-{
-  True,   /* valid */
-  False,  /* not autoloaded */
-  NULL,    /* szService */
-  NULL,    /* szPath */
-  NULL,    /* szUsername */
-  NULL,    /* szGuestAccount  - this is set in init_globals() */
-  NULL,    /* szInvalidUsers */
-  NULL,    /* szValidUsers */
-  NULL,    /* szAdminUsers */
-  NULL,    /* szCopy */
-  NULL,    /* szInclude */
-  NULL,    /* szPreExec */
-  NULL,    /* szPostExec */
-  NULL,    /* szRootPreExec */
-  NULL,    /* szRootPostExec */
-  NULL,    /* szPrintcommand */
-  NULL,    /* szLpqcommand */
-  NULL,    /* szLprmcommand */
-  NULL,    /* szLppausecommand */
-  NULL,    /* szLpresumecommand */
-  NULL,    /* szQueuepausecommand */
-  NULL,    /* szQueueresumecommand */
-  NULL,    /* szPrintername */
-  NULL,    /* szPrinterDriver - this is set in init_globals() */
-  NULL,    /* szPrinterDriverLocation */
-  NULL,    /* szDontdescend */
-  NULL,    /* szHostsallow */
-  NULL,    /* szHostsdeny */
-  NULL,    /* szMagicScript */
-  NULL,    /* szMagicOutput */
-  NULL,    /* szMangledMap */
-  NULL,    /* szVetoFiles */
-  NULL,    /* szHideFiles */
-  NULL,    /* szVetoOplockFiles */
-  NULL,    /* comment */
-  NULL,    /* force user */
-  NULL,    /* force group */
-  NULL,    /* readlist */
-  NULL,    /* writelist */
-  NULL,    /* volume */
-  NULL,    /* fstype */
-  NULL,    /* vfs object */
-  NULL,    /* vfs options */
-  0,       /* iMinPrintSpace */
-  0,       /* iWriteCacheSize */
-  0744,    /* iCreate_mask */
-  0000,    /* iCreate_force_mode */
-  -1,      /* iSecurity_mask */
-  -1,      /* iSecurity_force_mode */
-  0755,    /* iDir_mask */
-  0000,    /* iDir_force_mode */
-  -1,      /* iDir_Security_mask */
-  -1,      /* iDir_Security_force_mode */
-  0,       /* iMaxConnections */
-  CASE_LOWER, /* iDefaultCase */
-  DEFAULT_PRINTING, /* iPrinting */
-  2,       /* iOplockContentionLimit */
-  False,   /* bAlternatePerm */
-  False,   /* bPreexecClose */
-  False,   /* bRootpreexecClose */
-  False,   /* case sensitive */
-  True,   /* case preserve */
-  True,   /* short case preserve */
-  False,  /* case mangle */
-  True,  /* status */
-  True,  /* bHideDotFiles */
-  True,  /* bBrowseable */
-  True,  /* bAvailable */
-  True,  /* bRead_only */
-  True,  /* bNo_set_dir */
-  False, /* bGuest_only */
-  False, /* bGuest_ok */
-  False, /* bPrint_ok */
-  False, /* bPostscript */
-  False, /* bMap_system */
-  False, /* bMap_hidden */
-  True,  /* bMap_archive */
-  True,  /* bLocking */
-  False,  /* bStrictLocking */
-  True,   /* bPosixLocking */
+static service sDefault = {
+	True,			/* valid */
+	False,			/* not autoloaded */
+	NULL,			/* szService */
+	NULL,			/* szPath */
+	NULL,			/* szUsername */
+	NULL,			/* szGuestAccount  - this is set in init_globals() */
+	NULL,			/* szInvalidUsers */
+	NULL,			/* szValidUsers */
+	NULL,			/* szAdminUsers */
+	NULL,			/* szCopy */
+	NULL,			/* szInclude */
+	NULL,			/* szPreExec */
+	NULL,			/* szPostExec */
+	NULL,			/* szRootPreExec */
+	NULL,			/* szRootPostExec */
+	NULL,			/* szPrintcommand */
+	NULL,			/* szLpqcommand */
+	NULL,			/* szLprmcommand */
+	NULL,			/* szLppausecommand */
+	NULL,			/* szLpresumecommand */
+	NULL,			/* szQueuepausecommand */
+	NULL,			/* szQueueresumecommand */
+	NULL,			/* szPrintername */
+	NULL,			/* szPrinterDriver - this is set in init_globals() */
+	NULL,			/* szPrinterDriverLocation */
+	NULL,			/* szDontdescend */
+	NULL,			/* szHostsallow */
+	NULL,			/* szHostsdeny */
+	NULL,			/* szMagicScript */
+	NULL,			/* szMagicOutput */
+	NULL,			/* szMangledMap */
+	NULL,			/* szVetoFiles */
+	NULL,			/* szHideFiles */
+	NULL,			/* szVetoOplockFiles */
+	NULL,			/* comment */
+	NULL,			/* force user */
+	NULL,			/* force group */
+	NULL,			/* readlist */
+	NULL,			/* writelist */
+	NULL,			/* volume */
+	NULL,			/* fstype */
+	NULL,			/* vfs object */
+	NULL,			/* vfs options */
+	0,			/* iMinPrintSpace */
+	0,			/* iWriteCacheSize */
+	0744,			/* iCreate_mask */
+	0000,			/* iCreate_force_mode */
+	-1,			/* iSecurity_mask */
+	-1,			/* iSecurity_force_mode */
+	0755,			/* iDir_mask */
+	0000,			/* iDir_force_mode */
+	-1,			/* iDir_Security_mask */
+	-1,			/* iDir_Security_force_mode */
+	0,			/* iMaxConnections */
+	CASE_LOWER,		/* iDefaultCase */
+	DEFAULT_PRINTING,	/* iPrinting */
+	2,			/* iOplockContentionLimit */
+	False,			/* bAlternatePerm */
+	False,			/* bPreexecClose */
+	False,			/* bRootpreexecClose */
+	False,			/* case sensitive */
+	True,			/* case preserve */
+	True,			/* short case preserve */
+	False,			/* case mangle */
+	True,			/* status */
+	True,			/* bHideDotFiles */
+	True,			/* bBrowseable */
+	True,			/* bAvailable */
+	True,			/* bRead_only */
+	True,			/* bNo_set_dir */
+	False,			/* bGuest_only */
+	False,			/* bGuest_ok */
+	False,			/* bPrint_ok */
+	False,			/* bPostscript */
+	False,			/* bMap_system */
+	False,			/* bMap_hidden */
+	True,			/* bMap_archive */
+	True,			/* bLocking */
+	False,			/* bStrictLocking */
+	True,			/* bPosixLocking */
 #ifdef WITH_UTMP
-  False,  /* bUtmp */
+	False,			/* bUtmp */
 #endif
-  True,  /* bShareModes */
-  True,  /* bOpLocks */
-  True, /* bLevel2OpLocks */
-  False, /* bOnlyUser */
-  True,  /* bMangledNames */
-  True,  /* bWidelinks */
-  True,  /* bSymlinks */
-  False, /* bSyncAlways */
-  False, /* bStrictSync */
-  '~',   /* magic char */
-  NULL,  /* copymap */
-  False, /* bDeleteReadonly */
-  False, /* bFakeOplocks */
-  False, /* bDeleteVetoFiles */
-  False, /* bDosFiletimes */
-  False, /* bDosFiletimeResolution */
-  False, /* bFakeDirCreateTimes */
-  True,  /* bBlockingLocks */
-  False, /* bInheritPerms */
-  False, /* bMSDfsRoot */
-
-  ""     /* dummy */
+	True,			/* bShareModes */
+	True,			/* bOpLocks */
+	True,			/* bLevel2OpLocks */
+	False,			/* bOnlyUser */
+	True,			/* bMangledNames */
+	True,			/* bWidelinks */
+	True,			/* bSymlinks */
+	False,			/* bSyncAlways */
+	False,			/* bStrictSync */
+	'~',			/* magic char */
+	NULL,			/* copymap */
+	False,			/* bDeleteReadonly */
+	False,			/* bFakeOplocks */
+	False,			/* bDeleteVetoFiles */
+	False,			/* bDosFiletimes */
+	False,			/* bDosFiletimeResolution */
+	False,			/* bFakeDirCreateTimes */
+	True,			/* bBlockingLocks */
+	False,			/* bInheritPerms */
+	False,			/* bMSDfsRoot */
+
+	""			/* dummy */
 };
 
 
@@ -494,6 +495,7 @@ static int iNumServices = 0;
 static int iServiceIndex = 0;
 static BOOL bInGlobalSection = True;
 static BOOL bGlobalOnly = False;
+static int server_role;
 static int default_server_announce;
 
 #define NUMPARAMETERS (sizeof(parm_table) / sizeof(struct parm_struct))
@@ -502,30 +504,37 @@ static int default_server_announce;
 static BOOL handle_valid_chars(char *pszParmValue, char **ptr);
 static BOOL handle_include(char *pszParmValue, char **ptr);
 static BOOL handle_copy(char *pszParmValue, char **ptr);
-static BOOL handle_character_set(char *pszParmValue,char **ptr);
-static BOOL handle_coding_system(char *pszParmValue,char **ptr);
-static BOOL handle_client_code_page(char *pszParmValue,char **ptr);
+static BOOL handle_character_set(char *pszParmValue, char **ptr);
+static BOOL handle_coding_system(char *pszParmValue, char **ptr);
+static BOOL handle_client_code_page(char *pszParmValue, char **ptr);
 static BOOL handle_vfs_object(char *pszParmValue, char **ptr);
-static BOOL handle_source_env(char *pszParmValue,char **ptr);
-static BOOL handle_netbios_name(char *pszParmValue,char **ptr);
+static BOOL handle_source_env(char *pszParmValue, char **ptr);
+static BOOL handle_netbios_name(char *pszParmValue, char **ptr);
 static BOOL handle_winbind_id(char *pszParmValue, char **ptr);
 
+static void set_server_role(void);
 static void set_default_server_announce_type(void);
 
-static struct enum_list enum_protocol[] = {{PROTOCOL_NT1, "NT1"}, {PROTOCOL_LANMAN2, "LANMAN2"}, 
-					   {PROTOCOL_LANMAN1, "LANMAN1"}, {PROTOCOL_CORE,"CORE"}, 
-					   {PROTOCOL_COREPLUS, "COREPLUS"}, 
-					   {PROTOCOL_COREPLUS, "CORE+"}, {-1, NULL}};
+static struct enum_list enum_protocol[] =
+	{ {PROTOCOL_NT1, "NT1"}, {PROTOCOL_LANMAN2, "LANMAN2"},
+{PROTOCOL_LANMAN1, "LANMAN1"}, {PROTOCOL_CORE, "CORE"},
+{PROTOCOL_COREPLUS, "COREPLUS"},
+{PROTOCOL_COREPLUS, "CORE+"}, {-1, NULL}
+};
 
-static struct enum_list enum_security[] = {{SEC_SHARE, "SHARE"},  {SEC_USER, "USER"}, 
-					   {SEC_SERVER, "SERVER"}, {SEC_DOMAIN, "DOMAIN"},
-                                           {-1, NULL}};
+static struct enum_list enum_security[] =
+	{ {SEC_SHARE, "SHARE"}, {SEC_USER, "USER"},
+{SEC_SERVER, "SERVER"}, {SEC_DOMAIN, "DOMAIN"},
+{-1, NULL}
+};
 
-static struct enum_list enum_printing[] = {{PRINT_SYSV, "sysv"}, {PRINT_AIX, "aix"}, 
-					   {PRINT_HPUX, "hpux"}, {PRINT_BSD, "bsd"},
-					   {PRINT_QNX, "qnx"},   {PRINT_PLP, "plp"},
-					   {PRINT_LPRNG, "lprng"}, {PRINT_SOFTQ, "softq"},
-					   {PRINT_CUPS, "cups"}, {-1, NULL}};
+static struct enum_list enum_printing[] =
+	{ {PRINT_SYSV, "sysv"}, {PRINT_AIX, "aix"},
+{PRINT_HPUX, "hpux"}, {PRINT_BSD, "bsd"},
+{PRINT_QNX, "qnx"}, {PRINT_PLP, "plp"},
+{PRINT_LPRNG, "lprng"}, {PRINT_SOFTQ, "softq"},
+{PRINT_CUPS, "cups"}, {-1, NULL}
+};
 
 /* Types of machine we can announce as. */
 #define ANNOUNCE_AS_NT_SERVER 1
@@ -533,11 +542,17 @@ static struct enum_list enum_printing[] = {{PRINT_SYSV, "sysv"}, {PRINT_AIX, "ai
 #define ANNOUNCE_AS_WFW 3
 #define ANNOUNCE_AS_NT_WORKSTATION 4
 
-static struct enum_list enum_announce_as[] = {{ANNOUNCE_AS_NT_SERVER, "NT"}, {ANNOUNCE_AS_NT_SERVER, "NT Server"}, {ANNOUNCE_AS_NT_WORKSTATION, "NT Workstation"}, {ANNOUNCE_AS_WIN95, "win95"}, {ANNOUNCE_AS_WFW, "WfW"}, {-1, NULL}};
+static struct enum_list enum_announce_as[] =
+	{ {ANNOUNCE_AS_NT_SERVER, "NT"}, {ANNOUNCE_AS_NT_SERVER, "NT Server"},
+	{ANNOUNCE_AS_NT_WORKSTATION, "NT Workstation"}, {ANNOUNCE_AS_WIN95,
+							 "win95"},
+	{ANNOUNCE_AS_WFW, "WfW"}, {-1, NULL} };
 
-static struct enum_list enum_case[] = {{CASE_LOWER, "lower"}, {CASE_UPPER, "upper"}, {-1, NULL}};
+static struct enum_list enum_case[] =
+	{ {CASE_LOWER, "lower"}, {CASE_UPPER, "upper"}, {-1, NULL} };
 
-static struct enum_list enum_lm_announce[] = {{0, "False"}, {1, "True"}, {2, "Auto"}, {-1, NULL}};
+static struct enum_list enum_bool_auto[] =
+	{ {False, "False"}, {True, "True"}, {Auto, "Auto"}, {-1, NULL} };
 
 /* 
    Do you want session setups at user level security with a invalid
@@ -560,345 +575,634 @@ static struct enum_list enum_lm_announce[] = {{0, "False"}, {1, "True"}, {2, "Au
    level security.
 */
 
-static struct enum_list enum_map_to_guest[] = {{NEVER_MAP_TO_GUEST, "Never"}, {MAP_TO_GUEST_ON_BAD_USER, "Bad User"}, {MAP_TO_GUEST_ON_BAD_PASSWORD, "Bad Password"}, {-1, NULL}};
+static struct enum_list enum_map_to_guest[] =
+	{ {NEVER_MAP_TO_GUEST, "Never"}, {MAP_TO_GUEST_ON_BAD_USER,
+					  "Bad User"},
+	{MAP_TO_GUEST_ON_BAD_PASSWORD, "Bad Password"}, {-1, NULL} };
 
 #ifdef WITH_SSL
-static struct enum_list enum_ssl_version[] = {{SMB_SSL_V2, "ssl2"}, {SMB_SSL_V3, "ssl3"},
-  {SMB_SSL_V23, "ssl2or3"}, {SMB_SSL_TLS1, "tls1"}, {-1, NULL}};
+static struct enum_list enum_ssl_version[] =
+	{ {SMB_SSL_V2, "ssl2"}, {SMB_SSL_V3, "ssl3"},
+{SMB_SSL_V23, "ssl2or3"}, {SMB_SSL_TLS1, "tls1"}, {-1, NULL}
+};
 #endif
 
 /* note that we do not initialise the defaults union - it is not allowed in ANSI C */
-static struct parm_struct parm_table[] =
-{
-  {"Base Options", P_SEP, P_SEPARATOR},
-  {"coding system",    P_STRING,  P_GLOBAL, &Globals.szCodingSystem,    handle_coding_system, NULL,  0},
-  {"client code page", P_INTEGER, P_GLOBAL, &Globals.client_code_page,	handle_client_code_page,   NULL,  0},
-  {"comment",          P_STRING,  P_LOCAL,  &sDefault.comment,          NULL,   NULL,  FLAG_BASIC|FLAG_SHARE|FLAG_PRINT|FLAG_DOS_STRING},
-  {"path",             P_STRING,  P_LOCAL,  &sDefault.szPath,           NULL,   NULL,  FLAG_BASIC|FLAG_SHARE|FLAG_PRINT|FLAG_DOS_STRING},
-  {"directory",        P_STRING,  P_LOCAL,  &sDefault.szPath,           NULL,   NULL,  FLAG_DOS_STRING},
-  {"workgroup",        P_USTRING, P_GLOBAL, &Globals.szWorkGroup,       NULL,   NULL,  FLAG_BASIC|FLAG_DOS_STRING},
-  {"netbios name",     P_UGSTRING,P_GLOBAL, global_myname,              handle_netbios_name,   NULL,  FLAG_BASIC|FLAG_DOS_STRING},
-  {"netbios aliases",  P_STRING,  P_GLOBAL, &Globals.szNetbiosAliases,  NULL,   NULL,  FLAG_DOS_STRING},
-  {"netbios scope",    P_UGSTRING,P_GLOBAL, global_scope,               NULL,   NULL,  FLAG_DOS_STRING},
-  {"server string",    P_STRING,  P_GLOBAL, &Globals.szServerString,    NULL,   NULL,  FLAG_BASIC|FLAG_DOS_STRING},
-  {"interfaces",       P_STRING,  P_GLOBAL, &Globals.szInterfaces,      NULL,   NULL,  FLAG_BASIC},
-  {"bind interfaces only", P_BOOL,P_GLOBAL, &Globals.bBindInterfacesOnly,NULL,   NULL,  0},
-
-  {"Security Options", P_SEP, P_SEPARATOR},
-  {"security",         P_ENUM,    P_GLOBAL, &Globals.security,          NULL,   enum_security, FLAG_BASIC},
-  {"encrypt passwords",P_BOOL,    P_GLOBAL, &Globals.bEncryptPasswords, NULL,   NULL,  FLAG_BASIC},
-  {"update encrypted", P_BOOL,    P_GLOBAL, &Globals.bUpdateEncrypt,    NULL,   NULL,  FLAG_BASIC},
-  {"allow trusted domains",P_BOOL,P_GLOBAL, &Globals.bAllowTrustedDomains,NULL, NULL,  0},
-  {"alternate permissions",P_BOOL,P_LOCAL,  &sDefault.bAlternatePerm,   NULL,   NULL,  FLAG_GLOBAL|FLAG_DEPRECATED},
-  {"hosts equiv",      P_STRING,  P_GLOBAL, &Globals.szHostsEquiv,      NULL,   NULL,  0},
-  {"min passwd length",     P_INTEGER, P_GLOBAL, &Globals.min_passwd_length, NULL,   NULL,  0},
-  {"min password length",   P_INTEGER, P_GLOBAL, &Globals.min_passwd_length, NULL,   NULL,  0},
-  {"map to guest",     P_ENUM,    P_GLOBAL, &Globals.map_to_guest,      NULL,   enum_map_to_guest, 0},
-  {"null passwords",   P_BOOL,    P_GLOBAL, &Globals.bNullPasswords,    NULL,   NULL,  0},
-  {"password server",  P_STRING,  P_GLOBAL, &Globals.szPasswordServer,  NULL,   NULL,  0},
-  {"smb passwd file",  P_STRING,  P_GLOBAL, &Globals.szSMBPasswdFile,   NULL,   NULL,  0},
-  {"root directory",   P_STRING,  P_GLOBAL, &Globals.szRootdir,         NULL,   NULL,  0},
-  {"root dir",         P_STRING,  P_GLOBAL, &Globals.szRootdir,         NULL,   NULL,  0},
-  {"root",             P_STRING,  P_GLOBAL, &Globals.szRootdir,         NULL,   NULL,  0},
-  {"passwd program",   P_STRING,  P_GLOBAL, &Globals.szPasswdProgram,   NULL,   NULL,  0},
-  {"passwd chat",      P_STRING,  P_GLOBAL, &Globals.szPasswdChat,      NULL,   NULL,  0},
-  {"passwd chat debug",P_BOOL,    P_GLOBAL, &Globals.bPasswdChatDebug,  NULL,   NULL,  0},
-  {"username map",     P_STRING,  P_GLOBAL, &Globals.szUsernameMap,     NULL,   NULL,  0},
-  {"password level",   P_INTEGER, P_GLOBAL, &Globals.pwordlevel,        NULL,   NULL,  0},
-  {"username level",   P_INTEGER, P_GLOBAL, &Globals.unamelevel,        NULL,   NULL,  0},
-  {"unix password sync", P_BOOL,  P_GLOBAL, &Globals.bUnixPasswdSync,   NULL,   NULL,  0},
-  {"restrict anonymous", P_BOOL,  P_GLOBAL, &Globals.bRestrictAnonymous,NULL,   NULL,  0},
-  {"use rhosts",       P_BOOL,    P_GLOBAL, &Globals.bUseRhosts,        NULL,   NULL,  0},
-  {"username",         P_STRING,  P_LOCAL,  &sDefault.szUsername,       NULL,   NULL,  FLAG_GLOBAL|FLAG_SHARE},
-  {"user",             P_STRING,  P_LOCAL,  &sDefault.szUsername,       NULL,   NULL,  0},
-  {"users",            P_STRING,  P_LOCAL,  &sDefault.szUsername,       NULL,   NULL,  0},
-  {"guest account",    P_STRING,  P_LOCAL,  &sDefault.szGuestaccount,   NULL,   NULL,  FLAG_BASIC|FLAG_SHARE|FLAG_PRINT|FLAG_GLOBAL},
-  {"invalid users",    P_STRING,  P_LOCAL,  &sDefault.szInvalidUsers,   NULL,   NULL,  FLAG_GLOBAL|FLAG_SHARE},
-  {"valid users",      P_STRING,  P_LOCAL,  &sDefault.szValidUsers,     NULL,   NULL,  FLAG_GLOBAL|FLAG_SHARE},
-  {"admin users",      P_STRING,  P_LOCAL,  &sDefault.szAdminUsers,     NULL,   NULL,  FLAG_GLOBAL|FLAG_SHARE},
-  {"read list",        P_STRING,  P_LOCAL,  &sDefault.readlist,         NULL,   NULL,  FLAG_GLOBAL|FLAG_SHARE},
-  {"write list",       P_STRING,  P_LOCAL,  &sDefault.writelist,        NULL,   NULL,  FLAG_GLOBAL|FLAG_SHARE},
-  {"force user",       P_STRING,  P_LOCAL,  &sDefault.force_user,       NULL,   NULL,  FLAG_SHARE},
-  {"force group",      P_STRING,  P_LOCAL,  &sDefault.force_group,      NULL,   NULL,  FLAG_SHARE},
-  {"group",            P_STRING,  P_LOCAL,  &sDefault.force_group,      NULL,   NULL,  0},
-  {"read only",        P_BOOL,    P_LOCAL,  &sDefault.bRead_only,       NULL,   NULL,  FLAG_BASIC|FLAG_SHARE},
-  {"write ok",         P_BOOLREV, P_LOCAL,  &sDefault.bRead_only,       NULL,   NULL,  0},
-  {"writeable",        P_BOOLREV, P_LOCAL,  &sDefault.bRead_only,       NULL,   NULL,  0},
-  {"writable",         P_BOOLREV, P_LOCAL,  &sDefault.bRead_only,       NULL,   NULL,  0},
-  {"create mask",      P_OCTAL,   P_LOCAL,  &sDefault.iCreate_mask,     NULL,   NULL,  FLAG_GLOBAL|FLAG_SHARE},
-  {"create mode",      P_OCTAL,   P_LOCAL,  &sDefault.iCreate_mask,     NULL,   NULL,  FLAG_GLOBAL},
-  {"force create mode",P_OCTAL,   P_LOCAL,  &sDefault.iCreate_force_mode,     NULL,   NULL,  FLAG_GLOBAL|FLAG_SHARE},
-  {"security mask",    P_OCTAL,   P_LOCAL,  &sDefault.iSecurity_mask,   NULL,   NULL,  FLAG_GLOBAL|FLAG_SHARE},
-  {"force security mode",P_OCTAL, P_LOCAL,  &sDefault.iSecurity_force_mode,NULL,NULL,  FLAG_GLOBAL|FLAG_SHARE},
-  {"directory mask",   P_OCTAL,   P_LOCAL,  &sDefault.iDir_mask,        NULL,   NULL,  FLAG_GLOBAL|FLAG_SHARE},
-  {"directory mode",   P_OCTAL,   P_LOCAL,  &sDefault.iDir_mask,        NULL,   NULL,  FLAG_GLOBAL},
-  {"force directory mode",   P_OCTAL,P_LOCAL,&sDefault.iDir_force_mode, NULL,   NULL,  FLAG_GLOBAL|FLAG_SHARE},
-  {"directory security mask",P_OCTAL,P_LOCAL,&sDefault.iDir_Security_mask,NULL, NULL,  FLAG_GLOBAL|FLAG_SHARE},
-  {"force directory security mode",P_OCTAL, P_LOCAL,  &sDefault.iDir_Security_force_mode,NULL,NULL,FLAG_GLOBAL|FLAG_SHARE},
-  {"inherit permissions",P_BOOL,  P_LOCAL,  &sDefault.bInheritPerms,    NULL,   NULL,  FLAG_SHARE},
-  {"guest only",       P_BOOL,    P_LOCAL,  &sDefault.bGuest_only,      NULL,   NULL,  FLAG_SHARE},
-  {"only guest",       P_BOOL,    P_LOCAL,  &sDefault.bGuest_only,      NULL,   NULL,  0},
-  {"guest ok",         P_BOOL,    P_LOCAL,  &sDefault.bGuest_ok,        NULL,   NULL,  FLAG_BASIC|FLAG_SHARE|FLAG_PRINT},
-  {"public",           P_BOOL,    P_LOCAL,  &sDefault.bGuest_ok,        NULL,   NULL,  0},
-  {"only user",        P_BOOL,    P_LOCAL,  &sDefault.bOnlyUser,        NULL,   NULL,  FLAG_SHARE},
-  {"hosts allow",      P_STRING,  P_LOCAL,  &sDefault.szHostsallow,     NULL,   NULL,  FLAG_GLOBAL|FLAG_BASIC|FLAG_SHARE|FLAG_PRINT},
-  {"allow hosts",      P_STRING,  P_LOCAL,  &sDefault.szHostsallow,     NULL,   NULL,  0},
-  {"hosts deny",       P_STRING,  P_LOCAL,  &sDefault.szHostsdeny,      NULL,   NULL,  FLAG_GLOBAL|FLAG_BASIC|FLAG_SHARE|FLAG_PRINT},
-  {"deny hosts",       P_STRING,  P_LOCAL,  &sDefault.szHostsdeny,      NULL,   NULL,  0},
+static struct parm_struct parm_table[] = {
+	{"Base Options", P_SEP, P_SEPARATOR},
+	
+		{"coding system", P_STRING, P_GLOBAL, &Globals.szCodingSystem,
+	 handle_coding_system, NULL, 0},
+	{"client code page", P_INTEGER, P_GLOBAL, &Globals.client_code_page,
+	 handle_client_code_page, NULL, 0},
+	{"comment", P_STRING, P_LOCAL, &sDefault.comment, NULL, NULL,
+	 FLAG_BASIC | FLAG_SHARE | FLAG_PRINT | FLAG_DOS_STRING},
+	{"path", P_STRING, P_LOCAL, &sDefault.szPath, NULL, NULL,
+	 FLAG_BASIC | FLAG_SHARE | FLAG_PRINT | FLAG_DOS_STRING},
+	{"directory", P_STRING, P_LOCAL, &sDefault.szPath, NULL, NULL,
+	 FLAG_DOS_STRING},
+	{"workgroup", P_USTRING, P_GLOBAL, &Globals.szWorkGroup, NULL, NULL,
+	 FLAG_BASIC | FLAG_DOS_STRING},
+	{"netbios name", P_UGSTRING, P_GLOBAL, global_myname,
+	 handle_netbios_name, NULL, FLAG_BASIC | FLAG_DOS_STRING},
+	{"netbios aliases", P_STRING, P_GLOBAL, &Globals.szNetbiosAliases,
+	 NULL, NULL, FLAG_DOS_STRING},
+	{"netbios scope", P_UGSTRING, P_GLOBAL, global_scope, NULL, NULL,
+	 FLAG_DOS_STRING},
+	{"server string", P_STRING, P_GLOBAL, &Globals.szServerString, NULL,
+	 NULL, FLAG_BASIC | FLAG_DOS_STRING},
+	{"interfaces", P_STRING, P_GLOBAL, &Globals.szInterfaces, NULL, NULL,
+	 FLAG_BASIC},
+	{"bind interfaces only", P_BOOL, P_GLOBAL,
+	 &Globals.bBindInterfacesOnly, NULL, NULL, 0},
+
+	{"Security Options", P_SEP, P_SEPARATOR},
+	
+		{"security", P_ENUM, P_GLOBAL, &Globals.security, NULL,
+	 enum_security, FLAG_BASIC},
+	{"encrypt passwords", P_BOOL, P_GLOBAL, &Globals.bEncryptPasswords,
+	 NULL, NULL, FLAG_BASIC},
+	{"update encrypted", P_BOOL, P_GLOBAL, &Globals.bUpdateEncrypt, NULL,
+	 NULL, FLAG_BASIC},
+	{"allow trusted domains", P_BOOL, P_GLOBAL,
+	 &Globals.bAllowTrustedDomains, NULL, NULL, 0},
+	{"alternate permissions", P_BOOL, P_LOCAL, &sDefault.bAlternatePerm,
+	 NULL, NULL, FLAG_GLOBAL | FLAG_DEPRECATED},
+	{"hosts equiv", P_STRING, P_GLOBAL, &Globals.szHostsEquiv, NULL, NULL,
+	 0},
+	{"min passwd length", P_INTEGER, P_GLOBAL, &Globals.min_passwd_length,
+	 NULL, NULL, 0},
+	{"min password length", P_INTEGER, P_GLOBAL,
+	 &Globals.min_passwd_length, NULL, NULL, 0},
+	{"map to guest", P_ENUM, P_GLOBAL, &Globals.map_to_guest, NULL,
+	 enum_map_to_guest, 0},
+	{"null passwords", P_BOOL, P_GLOBAL, &Globals.bNullPasswords, NULL,
+	 NULL, 0},
+	{"password server", P_STRING, P_GLOBAL, &Globals.szPasswordServer,
+	 NULL, NULL, 0},
+	{"smb passwd file", P_STRING, P_GLOBAL, &Globals.szSMBPasswdFile,
+	 NULL, NULL, 0},
+	{"root directory", P_STRING, P_GLOBAL, &Globals.szRootdir, NULL, NULL,
+	 0},
+	{"root dir", P_STRING, P_GLOBAL, &Globals.szRootdir, NULL, NULL, 0},
+	{"root", P_STRING, P_GLOBAL, &Globals.szRootdir, NULL, NULL, 0},
+	
+		{"passwd program", P_STRING, P_GLOBAL,
+	 &Globals.szPasswdProgram, NULL, NULL, 0},
+	{"passwd chat", P_STRING, P_GLOBAL, &Globals.szPasswdChat, NULL, NULL,
+	 0},
+	{"passwd chat debug", P_BOOL, P_GLOBAL, &Globals.bPasswdChatDebug,
+	 NULL, NULL, 0},
+	{"username map", P_STRING, P_GLOBAL, &Globals.szUsernameMap, NULL,
+	 NULL, 0},
+	{"password level", P_INTEGER, P_GLOBAL, &Globals.pwordlevel, NULL,
+	 NULL, 0},
+	{"username level", P_INTEGER, P_GLOBAL, &Globals.unamelevel, NULL,
+	 NULL, 0},
+	{"unix password sync", P_BOOL, P_GLOBAL, &Globals.bUnixPasswdSync,
+	 NULL, NULL, 0},
+	{"restrict anonymous", P_BOOL, P_GLOBAL, &Globals.bRestrictAnonymous,
+	 NULL, NULL, 0},
+	{"use rhosts", P_BOOL, P_GLOBAL, &Globals.bUseRhosts, NULL, NULL, 0},
+	
+		{"username", P_STRING, P_LOCAL, &sDefault.szUsername, NULL,
+	 NULL, FLAG_GLOBAL | FLAG_SHARE},
+	{"user", P_STRING, P_LOCAL, &sDefault.szUsername, NULL, NULL, 0},
+	{"users", P_STRING, P_LOCAL, &sDefault.szUsername, NULL, NULL, 0},
+	
+		{"guest account", P_STRING, P_LOCAL, &sDefault.szGuestaccount,
+	 NULL, NULL, FLAG_BASIC | FLAG_SHARE | FLAG_PRINT | FLAG_GLOBAL},
+	{"invalid users", P_STRING, P_LOCAL, &sDefault.szInvalidUsers, NULL,
+	 NULL, FLAG_GLOBAL | FLAG_SHARE},
+	{"valid users", P_STRING, P_LOCAL, &sDefault.szValidUsers, NULL, NULL,
+	 FLAG_GLOBAL | FLAG_SHARE},
+	{"admin users", P_STRING, P_LOCAL, &sDefault.szAdminUsers, NULL, NULL,
+	 FLAG_GLOBAL | FLAG_SHARE},
+	{"read list", P_STRING, P_LOCAL, &sDefault.readlist, NULL, NULL,
+	 FLAG_GLOBAL | FLAG_SHARE},
+	{"write list", P_STRING, P_LOCAL, &sDefault.writelist, NULL, NULL,
+	 FLAG_GLOBAL | FLAG_SHARE},
+	{"force user", P_STRING, P_LOCAL, &sDefault.force_user, NULL, NULL,
+	 FLAG_SHARE},
+	{"force group", P_STRING, P_LOCAL, &sDefault.force_group, NULL, NULL,
+	 FLAG_SHARE},
+	{"group", P_STRING, P_LOCAL, &sDefault.force_group, NULL, NULL, 0},
+	
+		{"read only", P_BOOL, P_LOCAL, &sDefault.bRead_only, NULL,
+	 NULL, FLAG_BASIC | FLAG_SHARE},
+	{"write ok", P_BOOLREV, P_LOCAL, &sDefault.bRead_only, NULL, NULL, 0},
+	{"writeable", P_BOOLREV, P_LOCAL, &sDefault.bRead_only, NULL, NULL, 0},
+	{"writable", P_BOOLREV, P_LOCAL, &sDefault.bRead_only, NULL, NULL, 0},
+	
+		{"create mask", P_OCTAL, P_LOCAL, &sDefault.iCreate_mask,
+	 NULL, NULL, FLAG_GLOBAL | FLAG_SHARE},
+	{"create mode", P_OCTAL, P_LOCAL, &sDefault.iCreate_mask, NULL, NULL,
+	 FLAG_GLOBAL},
+	{"force create mode", P_OCTAL, P_LOCAL, &sDefault.iCreate_force_mode,
+	 NULL, NULL, FLAG_GLOBAL | FLAG_SHARE},
+	{"security mask", P_OCTAL, P_LOCAL, &sDefault.iSecurity_mask, NULL,
+	 NULL, FLAG_GLOBAL | FLAG_SHARE},
+	{"force security mode", P_OCTAL, P_LOCAL,
+	 &sDefault.iSecurity_force_mode, NULL, NULL,
+	 FLAG_GLOBAL | FLAG_SHARE},
+	{"directory mask", P_OCTAL, P_LOCAL, &sDefault.iDir_mask, NULL, NULL,
+	 FLAG_GLOBAL | FLAG_SHARE},
+	{"directory mode", P_OCTAL, P_LOCAL, &sDefault.iDir_mask, NULL, NULL,
+	 FLAG_GLOBAL},
+	{"force directory mode", P_OCTAL, P_LOCAL, &sDefault.iDir_force_mode,
+	 NULL, NULL, FLAG_GLOBAL | FLAG_SHARE},
+	{"directory security mask", P_OCTAL, P_LOCAL,
+	 &sDefault.iDir_Security_mask, NULL, NULL, FLAG_GLOBAL | FLAG_SHARE},
+	{"force directory security mode", P_OCTAL, P_LOCAL,
+	 &sDefault.iDir_Security_force_mode, NULL, NULL,
+	 FLAG_GLOBAL | FLAG_SHARE},
+	{"inherit permissions", P_BOOL, P_LOCAL, &sDefault.bInheritPerms,
+	 NULL, NULL, FLAG_SHARE},
+	{"guest only", P_BOOL, P_LOCAL, &sDefault.bGuest_only, NULL, NULL,
+	 FLAG_SHARE},
+	{"only guest", P_BOOL, P_LOCAL, &sDefault.bGuest_only, NULL, NULL, 0},
+	
+		{"guest ok", P_BOOL, P_LOCAL, &sDefault.bGuest_ok, NULL, NULL,
+	 FLAG_BASIC | FLAG_SHARE | FLAG_PRINT},
+	{"public", P_BOOL, P_LOCAL, &sDefault.bGuest_ok, NULL, NULL, 0},
+	
+		{"only user", P_BOOL, P_LOCAL, &sDefault.bOnlyUser, NULL,
+	 NULL, FLAG_SHARE},
+	{"hosts allow", P_STRING, P_LOCAL, &sDefault.szHostsallow, NULL, NULL,
+	 FLAG_GLOBAL | FLAG_BASIC | FLAG_SHARE | FLAG_PRINT},
+	{"allow hosts", P_STRING, P_LOCAL, &sDefault.szHostsallow, NULL, NULL,
+	 0},
+	{"hosts deny", P_STRING, P_LOCAL, &sDefault.szHostsdeny, NULL, NULL,
+	 FLAG_GLOBAL | FLAG_BASIC | FLAG_SHARE | FLAG_PRINT},
+	{"deny hosts", P_STRING, P_LOCAL, &sDefault.szHostsdeny, NULL, NULL,
+	 0},
 
 #ifdef WITH_SSL
-  {"Secure Socket Layer Options", P_SEP, P_SEPARATOR},
-  {"ssl",              P_BOOL,    P_GLOBAL, &Globals.sslEnabled,        NULL,   NULL,  0 },
-  {"ssl hosts",        P_STRING,  P_GLOBAL, &Globals.sslHostsRequire,   NULL,   NULL,  0 },
-  {"ssl hosts resign", P_STRING,  P_GLOBAL, &Globals.sslHostsResign,   NULL,   NULL,  0} ,
-  {"ssl CA certDir",   P_STRING,  P_GLOBAL, &Globals.sslCaCertDir,      NULL,   NULL,  0 },
-  {"ssl CA certFile",  P_STRING,  P_GLOBAL, &Globals.sslCaCertFile,     NULL,   NULL,  0 },
-  {"ssl server cert",  P_STRING,  P_GLOBAL, &Globals.sslCert,           NULL,   NULL,  0 },
-  {"ssl server key",   P_STRING,  P_GLOBAL, &Globals.sslPrivKey,        NULL,   NULL,  0 },
-  {"ssl client cert",  P_STRING,  P_GLOBAL, &Globals.sslClientCert,     NULL,   NULL,  0 },
-  {"ssl client key",   P_STRING,  P_GLOBAL, &Globals.sslClientPrivKey,  NULL,   NULL,  0 },
-  {"ssl require clientcert",  P_BOOL,  P_GLOBAL, &Globals.sslReqClientCert, NULL,   NULL ,  0},
-  {"ssl require servercert",  P_BOOL,  P_GLOBAL, &Globals.sslReqServerCert, NULL,   NULL ,  0},
-  {"ssl ciphers",      P_STRING,  P_GLOBAL, &Globals.sslCiphers,        NULL,   NULL,  0 },
-  {"ssl version",      P_ENUM,    P_GLOBAL, &Globals.sslVersion,        NULL,   enum_ssl_version, 0},
-  {"ssl compatibility", P_BOOL,    P_GLOBAL, &Globals.sslCompatibility, NULL,   NULL,  0 },
-#endif        /* WITH_SSL */
-
-  {"Logging Options", P_SEP, P_SEPARATOR},
-  {"log level",        P_INTEGER, P_GLOBAL, &DEBUGLEVEL,                NULL,   NULL,  FLAG_BASIC},
-  {"debuglevel",       P_INTEGER, P_GLOBAL, &DEBUGLEVEL,                NULL,   NULL,  0},
-  {"syslog",           P_INTEGER, P_GLOBAL, &Globals.syslog,            NULL,   NULL,  0},
-  {"syslog only",      P_BOOL,    P_GLOBAL, &Globals.bSyslogOnly,       NULL,   NULL,  0},
-  {"log file",         P_STRING,  P_GLOBAL, &Globals.szLogFile,         NULL,   NULL,  0},
-  {"max log size",     P_INTEGER, P_GLOBAL, &Globals.max_log_size,      NULL,   NULL,  0},
-  {"timestamp logs",   P_BOOL,    P_GLOBAL, &Globals.bTimestampLogs,    NULL,   NULL,  0},
-  {"debug timestamp",  P_BOOL,    P_GLOBAL, &Globals.bTimestampLogs,    NULL,   NULL,  0},
-  {"debug hires timestamp",  P_BOOL,    P_GLOBAL, &Globals.bDebugHiresTimestamp,    NULL,   NULL,  0},
-  {"debug pid",        P_BOOL,    P_GLOBAL, &Globals.bDebugPid,         NULL,   NULL,  0},
-  {"debug uid",        P_BOOL,    P_GLOBAL, &Globals.bDebugUid,         NULL,   NULL,  0},
-  {"status",           P_BOOL,    P_LOCAL,  &sDefault.status,           NULL,   NULL,  FLAG_GLOBAL|FLAG_SHARE|FLAG_PRINT},
-
-  {"Protocol Options", P_SEP, P_SEPARATOR},
-  {"protocol",         P_ENUM,    P_GLOBAL, &Globals.maxprotocol,       NULL,   enum_protocol, 0},
-  {"read bmpx",        P_BOOL,    P_GLOBAL, &Globals.bReadbmpx,         NULL,   NULL,  0},
-  {"read raw",         P_BOOL,    P_GLOBAL, &Globals.bReadRaw,          NULL,   NULL,  0},
-  {"write raw",        P_BOOL,    P_GLOBAL, &Globals.bWriteRaw,         NULL,   NULL,  0},
-  {"nt smb support",   P_BOOL,    P_GLOBAL, &Globals.bNTSmbSupport,     NULL,   NULL,  0},
-  {"nt pipe support",  P_BOOL,    P_GLOBAL, &Globals.bNTPipeSupport,    NULL,   NULL,  0},
-  {"nt acl support",   P_BOOL,    P_GLOBAL, &Globals.bNTAclSupport,     NULL,   NULL,  0},
-  {"announce version", P_STRING,  P_GLOBAL, &Globals.szAnnounceVersion, NULL,   NULL,  0},
-  {"announce as",      P_ENUM,    P_GLOBAL, &Globals.announce_as,       NULL,   enum_announce_as, 0},
-  {"max mux",          P_INTEGER, P_GLOBAL, &Globals.max_mux,           NULL,   NULL,  0},
-  {"max xmit",         P_INTEGER, P_GLOBAL, &Globals.max_xmit,          NULL,   NULL,  0},
-  {"name resolve order",P_STRING, P_GLOBAL, &Globals.szNameResolveOrder,NULL,   NULL, 0},
-  {"max packet",       P_INTEGER, P_GLOBAL, &Globals.max_packet,        NULL,   NULL,  0},
-  {"packet size",      P_INTEGER, P_GLOBAL, &Globals.max_packet,        NULL,   NULL,  0},
-  {"max ttl",          P_INTEGER, P_GLOBAL, &Globals.max_ttl,           NULL,   NULL,  0},
-  {"max wins ttl",     P_INTEGER, P_GLOBAL, &Globals.max_wins_ttl,      NULL,   NULL,  0},
-  {"min wins ttl",     P_INTEGER, P_GLOBAL, &Globals.min_wins_ttl,      NULL,   NULL,  0},
-  {"time server",      P_BOOL,    P_GLOBAL, &Globals.bTimeServer,	    NULL,   NULL,  0},
-
-  {"Tuning Options", P_SEP, P_SEPARATOR},
-  {"change notify timeout", P_INTEGER, P_GLOBAL, &Globals.change_notify_timeout, NULL,   NULL,  0},
-  {"deadtime",         P_INTEGER, P_GLOBAL, &Globals.deadtime,          NULL,   NULL,  0},
-  {"getwd cache",      P_BOOL,    P_GLOBAL, &use_getwd_cache,           NULL,   NULL,  0},
-  {"keepalive",        P_INTEGER, P_GLOBAL, &keepalive,                 NULL,   NULL,  0},
-  {"lpq cache time",   P_INTEGER, P_GLOBAL, &Globals.lpqcachetime,      NULL,   NULL,  0},
-  {"max connections",  P_INTEGER, P_LOCAL,  &sDefault.iMaxConnections,  NULL,   NULL,  FLAG_SHARE},
-  {"max disk size",    P_INTEGER, P_GLOBAL, &Globals.maxdisksize,       NULL,   NULL,  0},
-  {"max open files",   P_INTEGER, P_GLOBAL, &Globals.max_open_files,    NULL,   NULL,  0},
-  {"min print space",  P_INTEGER, P_LOCAL,  &sDefault.iMinPrintSpace,   NULL,   NULL,  FLAG_PRINT},
-  {"read prediction",  P_BOOL,    P_GLOBAL, &Globals.bReadPrediction,   NULL,   NULL,  0},
-  {"read size",        P_INTEGER, P_GLOBAL, &Globals.ReadSize,          NULL,   NULL,  0},
-  {"shared mem size",  P_INTEGER, P_GLOBAL, &Globals.shmem_size,        NULL,   NULL,  0},
-  {"socket options",   P_GSTRING, P_GLOBAL, user_socket_options,        NULL,   NULL,  0},
-  {"stat cache size",  P_INTEGER, P_GLOBAL, &Globals.stat_cache_size,   NULL,   NULL,  0},
-  {"strict sync",      P_BOOL,    P_LOCAL,  &sDefault.bStrictSync,      NULL,   NULL,  FLAG_SHARE},
-  {"sync always",      P_BOOL,    P_LOCAL,  &sDefault.bSyncAlways,      NULL,   NULL,  FLAG_SHARE},
-  {"write cache size", P_INTEGER, P_LOCAL,  &sDefault.iWriteCacheSize,  NULL,   NULL,  FLAG_SHARE},
-
-  {"Printing Options", P_SEP, P_SEPARATOR},
-  {"load printers",    P_BOOL,    P_GLOBAL, &Globals.bLoadPrinters,     NULL,   NULL,  FLAG_PRINT},
-  {"printcap name",    P_STRING,  P_GLOBAL, &Globals.szPrintcapname,    NULL,   NULL,  FLAG_PRINT},
-  {"printcap",         P_STRING,  P_GLOBAL, &Globals.szPrintcapname,    NULL,   NULL,  0},
-  {"printer driver file", P_STRING,  P_GLOBAL, &Globals.szDriverFile,   NULL,   NULL,  FLAG_PRINT},
-  {"printable",        P_BOOL,    P_LOCAL,  &sDefault.bPrint_ok,        NULL,   NULL,  FLAG_PRINT},
-  {"print ok",         P_BOOL,    P_LOCAL,  &sDefault.bPrint_ok,        NULL,   NULL,  0},
-  {"postscript",       P_BOOL,    P_LOCAL,  &sDefault.bPostscript,      NULL,   NULL,  FLAG_PRINT},
-  {"printing",         P_ENUM,    P_LOCAL,  &sDefault.iPrinting,        NULL,   enum_printing, FLAG_PRINT|FLAG_GLOBAL},
-  {"print command",    P_STRING,  P_LOCAL,  &sDefault.szPrintcommand,   NULL,   NULL,  FLAG_PRINT|FLAG_GLOBAL},
-  {"lpq command",      P_STRING,  P_LOCAL,  &sDefault.szLpqcommand,     NULL,   NULL,  FLAG_PRINT|FLAG_GLOBAL},
-  {"lprm command",     P_STRING,  P_LOCAL,  &sDefault.szLprmcommand,    NULL,   NULL,  FLAG_PRINT|FLAG_GLOBAL},
-  {"lppause command",  P_STRING,  P_LOCAL,  &sDefault.szLppausecommand, NULL,   NULL,  FLAG_PRINT|FLAG_GLOBAL},
-  {"lpresume command", P_STRING,  P_LOCAL,  &sDefault.szLpresumecommand,NULL,   NULL,  FLAG_PRINT|FLAG_GLOBAL},
-  {"queuepause command", P_STRING, P_LOCAL, &sDefault.szQueuepausecommand, NULL, NULL, FLAG_PRINT|FLAG_GLOBAL},
-  {"queueresume command", P_STRING, P_LOCAL, &sDefault.szQueueresumecommand, NULL, NULL, FLAG_PRINT|FLAG_GLOBAL},
-
-  {"printer name",     P_STRING,  P_LOCAL,  &sDefault.szPrintername,    NULL,   NULL,  FLAG_PRINT},
-  {"printer",          P_STRING,  P_LOCAL,  &sDefault.szPrintername,    NULL,   NULL,  0},
-  {"printer driver",   P_STRING,  P_LOCAL,  &sDefault.szPrinterDriver,  NULL,   NULL,  FLAG_PRINT},
-  {"printer driver location",   P_STRING,  P_LOCAL,  &sDefault.szPrinterDriverLocation,  NULL,   NULL,  FLAG_PRINT|FLAG_GLOBAL},
-  {"nt forms file",    P_STRING,  P_GLOBAL, &Globals.szNtForms,         NULL,   NULL,  FLAG_GLOBAL},
-  {"nt printer driver",P_STRING,  P_GLOBAL, &Globals.szNtDriverFile,    NULL,   NULL,  FLAG_GLOBAL},
-
-
-  {"Filename Handling", P_SEP, P_SEPARATOR},
-  {"strip dot",        P_BOOL,    P_GLOBAL, &Globals.bStripDot,         NULL,   NULL,  0},
-  {"character set",    P_STRING,  P_GLOBAL, &Globals.szCharacterSet,    handle_character_set, NULL,  0},
-  {"mangled stack",    P_INTEGER, P_GLOBAL, &Globals.mangled_stack,     NULL,   NULL,  0},
-  {"default case",     P_ENUM, P_LOCAL,  &sDefault.iDefaultCase,        NULL,   enum_case, FLAG_SHARE},
-  {"case sensitive",   P_BOOL,    P_LOCAL,  &sDefault.bCaseSensitive,   NULL,   NULL,  FLAG_SHARE|FLAG_GLOBAL},
-  {"casesignames",     P_BOOL,    P_LOCAL,  &sDefault.bCaseSensitive,   NULL,   NULL,  0},
-  {"preserve case",    P_BOOL,    P_LOCAL,  &sDefault.bCasePreserve,    NULL,   NULL,  FLAG_SHARE|FLAG_GLOBAL},
-  {"short preserve case",P_BOOL,  P_LOCAL,  &sDefault.bShortCasePreserve,NULL,   NULL,  FLAG_SHARE|FLAG_GLOBAL},
-  {"mangle case",      P_BOOL,    P_LOCAL,  &sDefault.bCaseMangle,      NULL,   NULL,  FLAG_SHARE|FLAG_GLOBAL},
-  {"mangling char",    P_CHAR,    P_LOCAL,  &sDefault.magic_char,       NULL,   NULL,  FLAG_SHARE|FLAG_GLOBAL},
-  {"hide dot files",   P_BOOL,    P_LOCAL,  &sDefault.bHideDotFiles,    NULL,   NULL,  FLAG_SHARE|FLAG_GLOBAL},
-  {"delete veto files",P_BOOL,    P_LOCAL,  &sDefault.bDeleteVetoFiles, NULL,   NULL,  FLAG_SHARE|FLAG_GLOBAL},
-  {"veto files",       P_STRING,  P_LOCAL,  &sDefault.szVetoFiles,      NULL,   NULL,  FLAG_SHARE|FLAG_GLOBAL|FLAG_DOS_STRING},
-  {"hide files",       P_STRING,  P_LOCAL,  &sDefault.szHideFiles,      NULL,   NULL,  FLAG_SHARE|FLAG_GLOBAL|FLAG_DOS_STRING},
-  {"veto oplock files",P_STRING,  P_LOCAL,  &sDefault.szVetoOplockFiles,NULL,   NULL,  FLAG_SHARE|FLAG_GLOBAL|FLAG_DOS_STRING},
-  {"map system",       P_BOOL,    P_LOCAL,  &sDefault.bMap_system,      NULL,   NULL,  FLAG_SHARE|FLAG_GLOBAL},
-  {"map hidden",       P_BOOL,    P_LOCAL,  &sDefault.bMap_hidden,      NULL,   NULL,  FLAG_SHARE|FLAG_GLOBAL},
-  {"map archive",      P_BOOL,    P_LOCAL,  &sDefault.bMap_archive,     NULL,   NULL,  FLAG_SHARE|FLAG_GLOBAL},
-  {"mangled names",    P_BOOL,    P_LOCAL,  &sDefault.bMangledNames,    NULL,   NULL,  FLAG_SHARE|FLAG_GLOBAL},
-  {"mangled map",      P_STRING,  P_LOCAL,  &sDefault.szMangledMap,     NULL,   NULL,  FLAG_SHARE|FLAG_GLOBAL},
-  {"stat cache",       P_BOOL,    P_GLOBAL, &Globals.bStatCache,        NULL,   NULL,  0},
-
-  {"Domain Options", P_SEP, P_SEPARATOR},
-  {"domain groups",    P_STRING,  P_GLOBAL, &Globals.szDomainGroups,    NULL,   NULL,  0},
-  {"domain admin group",P_STRING, P_GLOBAL, &Globals.szDomainAdminGroup, NULL,   NULL,  0},
-  {"domain guest group",P_STRING, P_GLOBAL, &Globals.szDomainGuestGroup, NULL,   NULL,  0},
-  {"domain admin users",P_STRING, P_GLOBAL, &Globals.szDomainAdminUsers, NULL,   NULL,  0},
-  {"domain guest users",P_STRING, P_GLOBAL, &Globals.szDomainGuestUsers, NULL,   NULL,  0},
+	{"Secure Socket Layer Options", P_SEP, P_SEPARATOR},
+	{"ssl", P_BOOL, P_GLOBAL, &Globals.sslEnabled, NULL, NULL, 0},
+	
+		{"ssl hosts", P_STRING, P_GLOBAL, &Globals.sslHostsRequire,
+	 NULL, NULL, 0},
+	{"ssl hosts resign", P_STRING, P_GLOBAL, &Globals.sslHostsResign,
+	 NULL, NULL, 0},
+	{"ssl CA certDir", P_STRING, P_GLOBAL, &Globals.sslCaCertDir, NULL,
+	 NULL, 0},
+	{"ssl CA certFile", P_STRING, P_GLOBAL, &Globals.sslCaCertFile, NULL,
+	 NULL, 0},
+	{"ssl server cert", P_STRING, P_GLOBAL, &Globals.sslCert, NULL, NULL,
+	 0},
+	{"ssl server key", P_STRING, P_GLOBAL, &Globals.sslPrivKey, NULL,
+	 NULL, 0},
+	{"ssl client cert", P_STRING, P_GLOBAL, &Globals.sslClientCert, NULL,
+	 NULL, 0},
+	{"ssl client key", P_STRING, P_GLOBAL, &Globals.sslClientPrivKey,
+	 NULL, NULL, 0},
+	{"ssl require clientcert", P_BOOL, P_GLOBAL,
+	 &Globals.sslReqClientCert, NULL, NULL, 0},
+	{"ssl require servercert", P_BOOL, P_GLOBAL,
+	 &Globals.sslReqServerCert, NULL, NULL, 0},
+	{"ssl ciphers", P_STRING, P_GLOBAL, &Globals.sslCiphers, NULL, NULL,
+	 0},
+	{"ssl version", P_ENUM, P_GLOBAL, &Globals.sslVersion, NULL,
+	 enum_ssl_version, 0},
+	{"ssl compatibility", P_BOOL, P_GLOBAL, &Globals.sslCompatibility,
+	 NULL, NULL, 0},
+#endif /* WITH_SSL */
+
+	{"Logging Options", P_SEP, P_SEPARATOR},
+	{"log level", P_INTEGER, P_GLOBAL, &DEBUGLEVEL, NULL, NULL, FLAG_BASIC},
+	{"debuglevel", P_INTEGER, P_GLOBAL, &DEBUGLEVEL, NULL, NULL, 0},
+	{"syslog", P_INTEGER, P_GLOBAL, &Globals.syslog, NULL, NULL, 0},
+	{"syslog only", P_BOOL, P_GLOBAL, &Globals.bSyslogOnly, NULL, NULL, 0},
+	{"log file", P_STRING, P_GLOBAL, &Globals.szLogFile, NULL, NULL, 0},
+	
+		{"max log size", P_INTEGER, P_GLOBAL, &Globals.max_log_size,
+	 NULL, NULL, 0},
+	{"timestamp logs", P_BOOL, P_GLOBAL, &Globals.bTimestampLogs, NULL,
+	 NULL, 0},
+	{"debug timestamp", P_BOOL, P_GLOBAL, &Globals.bTimestampLogs, NULL,
+	 NULL, 0},
+	{"debug hires timestamp", P_BOOL, P_GLOBAL,
+	 &Globals.bDebugHiresTimestamp, NULL, NULL, 0},
+	{"debug pid", P_BOOL, P_GLOBAL, &Globals.bDebugPid, NULL, NULL, 0},
+	{"debug uid", P_BOOL, P_GLOBAL, &Globals.bDebugUid, NULL, NULL, 0},
+	
+		{"status", P_BOOL, P_LOCAL, &sDefault.status, NULL, NULL,
+	 FLAG_GLOBAL | FLAG_SHARE | FLAG_PRINT},
+
+	{"Protocol Options", P_SEP, P_SEPARATOR},
+	
+		{"protocol", P_ENUM, P_GLOBAL, &Globals.maxprotocol, NULL,
+	 enum_protocol, 0},
+	{"read bmpx", P_BOOL, P_GLOBAL, &Globals.bReadbmpx, NULL, NULL, 0},
+	{"read raw", P_BOOL, P_GLOBAL, &Globals.bReadRaw, NULL, NULL, 0},
+	{"write raw", P_BOOL, P_GLOBAL, &Globals.bWriteRaw, NULL, NULL, 0},
+	
+		{"nt smb support", P_BOOL, P_GLOBAL, &Globals.bNTSmbSupport,
+	 NULL, NULL, 0},
+	{"nt pipe support", P_BOOL, P_GLOBAL, &Globals.bNTPipeSupport, NULL,
+	 NULL, 0},
+	{"nt acl support", P_BOOL, P_GLOBAL, &Globals.bNTAclSupport, NULL,
+	 NULL, 0},
+	{"announce version", P_STRING, P_GLOBAL, &Globals.szAnnounceVersion,
+	 NULL, NULL, 0},
+	{"announce as", P_ENUM, P_GLOBAL, &Globals.announce_as, NULL,
+	 enum_announce_as, 0},
+	{"max mux", P_INTEGER, P_GLOBAL, &Globals.max_mux, NULL, NULL, 0},
+	{"max xmit", P_INTEGER, P_GLOBAL, &Globals.max_xmit, NULL, NULL, 0},
+	
+		{"name resolve order", P_STRING, P_GLOBAL,
+	 &Globals.szNameResolveOrder, NULL, NULL, 0},
+	{"max packet", P_INTEGER, P_GLOBAL, &Globals.max_packet, NULL, NULL,
+	 0},
+	{"packet size", P_INTEGER, P_GLOBAL, &Globals.max_packet, NULL, NULL,
+	 0},
+	{"max ttl", P_INTEGER, P_GLOBAL, &Globals.max_ttl, NULL, NULL, 0},
+	
+		{"max wins ttl", P_INTEGER, P_GLOBAL, &Globals.max_wins_ttl,
+	 NULL, NULL, 0},
+	{"min wins ttl", P_INTEGER, P_GLOBAL, &Globals.min_wins_ttl, NULL,
+	 NULL, 0},
+	{"time server", P_BOOL, P_GLOBAL, &Globals.bTimeServer, NULL, NULL,
+	 0},
+
+	{"Tuning Options", P_SEP, P_SEPARATOR},
+	
+		{"change notify timeout", P_INTEGER, P_GLOBAL,
+	 &Globals.change_notify_timeout, NULL, NULL, 0},
+	{"deadtime", P_INTEGER, P_GLOBAL, &Globals.deadtime, NULL, NULL, 0},
+	{"getwd cache", P_BOOL, P_GLOBAL, &use_getwd_cache, NULL, NULL, 0},
+	{"keepalive", P_INTEGER, P_GLOBAL, &keepalive, NULL, NULL, 0},
+	
+		{"lpq cache time", P_INTEGER, P_GLOBAL, &Globals.lpqcachetime,
+	 NULL, NULL, 0},
+	{"max connections", P_INTEGER, P_LOCAL, &sDefault.iMaxConnections,
+	 NULL, NULL, FLAG_SHARE},
+	{"max disk size", P_INTEGER, P_GLOBAL, &Globals.maxdisksize, NULL,
+	 NULL, 0},
+	{"max open files", P_INTEGER, P_GLOBAL, &Globals.max_open_files, NULL,
+	 NULL, 0},
+	{"min print space", P_INTEGER, P_LOCAL, &sDefault.iMinPrintSpace,
+	 NULL, NULL, FLAG_PRINT},
+	{"read prediction", P_BOOL, P_GLOBAL, &Globals.bReadPrediction, NULL,
+	 NULL, 0},
+	{"read size", P_INTEGER, P_GLOBAL, &Globals.ReadSize, NULL, NULL, 0},
+	
+		{"shared mem size", P_INTEGER, P_GLOBAL, &Globals.shmem_size,
+	 NULL, NULL, 0},
+	{"socket options", P_GSTRING, P_GLOBAL, user_socket_options, NULL,
+	 NULL, 0},
+	{"stat cache size", P_INTEGER, P_GLOBAL, &Globals.stat_cache_size,
+	 NULL, NULL, 0},
+	{"strict sync", P_BOOL, P_LOCAL, &sDefault.bStrictSync, NULL, NULL,
+	 FLAG_SHARE},
+	{"sync always", P_BOOL, P_LOCAL, &sDefault.bSyncAlways, NULL, NULL,
+	 FLAG_SHARE},
+	{"write cache size", P_INTEGER, P_LOCAL, &sDefault.iWriteCacheSize,
+	 NULL, NULL, FLAG_SHARE},
+
+	{"Printing Options", P_SEP, P_SEPARATOR},
+	
+		{"load printers", P_BOOL, P_GLOBAL, &Globals.bLoadPrinters,
+	 NULL, NULL, FLAG_PRINT},
+	{"printcap name", P_STRING, P_GLOBAL, &Globals.szPrintcapname, NULL,
+	 NULL, FLAG_PRINT},
+	{"printcap", P_STRING, P_GLOBAL, &Globals.szPrintcapname, NULL, NULL,
+	 0},
+	{"printer driver file", P_STRING, P_GLOBAL, &Globals.szDriverFile,
+	 NULL, NULL, FLAG_PRINT},
+	{"printable", P_BOOL, P_LOCAL, &sDefault.bPrint_ok, NULL, NULL,
+	 FLAG_PRINT},
+	{"print ok", P_BOOL, P_LOCAL, &sDefault.bPrint_ok, NULL, NULL, 0},
+	
+		{"postscript", P_BOOL, P_LOCAL, &sDefault.bPostscript, NULL,
+	 NULL, FLAG_PRINT},
+	{"printing", P_ENUM, P_LOCAL, &sDefault.iPrinting, NULL,
+	 enum_printing, FLAG_PRINT | FLAG_GLOBAL},
+	{"print command", P_STRING, P_LOCAL, &sDefault.szPrintcommand, NULL,
+	 NULL, FLAG_PRINT | FLAG_GLOBAL},
+	{"lpq command", P_STRING, P_LOCAL, &sDefault.szLpqcommand, NULL, NULL,
+	 FLAG_PRINT | FLAG_GLOBAL},
+	{"lprm command", P_STRING, P_LOCAL, &sDefault.szLprmcommand, NULL,
+	 NULL, FLAG_PRINT | FLAG_GLOBAL},
+	{"lppause command", P_STRING, P_LOCAL, &sDefault.szLppausecommand,
+	 NULL, NULL, FLAG_PRINT | FLAG_GLOBAL},
+	{"lpresume command", P_STRING, P_LOCAL, &sDefault.szLpresumecommand,
+	 NULL, NULL, FLAG_PRINT | FLAG_GLOBAL},
+	{"queuepause command", P_STRING, P_LOCAL,
+	 &sDefault.szQueuepausecommand, NULL, NULL, FLAG_PRINT | FLAG_GLOBAL},
+	{"queueresume command", P_STRING, P_LOCAL,
+	 &sDefault.szQueueresumecommand, NULL, NULL,
+	 FLAG_PRINT | FLAG_GLOBAL},
+
+	
+		{"printer name", P_STRING, P_LOCAL, &sDefault.szPrintername,
+	 NULL, NULL, FLAG_PRINT},
+	{"printer", P_STRING, P_LOCAL, &sDefault.szPrintername, NULL, NULL,
+	 0},
+	{"printer driver", P_STRING, P_LOCAL, &sDefault.szPrinterDriver, NULL,
+	 NULL, FLAG_PRINT},
+	{"printer driver location", P_STRING, P_LOCAL,
+	 &sDefault.szPrinterDriverLocation, NULL, NULL,
+	 FLAG_PRINT | FLAG_GLOBAL},
+	{"nt forms file", P_STRING, P_GLOBAL, &Globals.szNtForms, NULL, NULL,
+	 FLAG_GLOBAL},
+	{"nt printer driver", P_STRING, P_GLOBAL, &Globals.szNtDriverFile,
+	 NULL, NULL, FLAG_GLOBAL},
+
+
+	{"Filename Handling", P_SEP, P_SEPARATOR},
+	{"strip dot", P_BOOL, P_GLOBAL, &Globals.bStripDot, NULL, NULL, 0},
+	
+		{"character set", P_STRING, P_GLOBAL, &Globals.szCharacterSet,
+	 handle_character_set, NULL, 0},
+	{"mangled stack", P_INTEGER, P_GLOBAL, &Globals.mangled_stack, NULL,
+	 NULL, 0},
+	{"default case", P_ENUM, P_LOCAL, &sDefault.iDefaultCase, NULL,
+	 enum_case, FLAG_SHARE},
+	{"case sensitive", P_BOOL, P_LOCAL, &sDefault.bCaseSensitive, NULL,
+	 NULL, FLAG_SHARE | FLAG_GLOBAL},
+	{"casesignames", P_BOOL, P_LOCAL, &sDefault.bCaseSensitive, NULL,
+	 NULL, 0},
+	{"preserve case", P_BOOL, P_LOCAL, &sDefault.bCasePreserve, NULL,
+	 NULL, FLAG_SHARE | FLAG_GLOBAL},
+	{"short preserve case", P_BOOL, P_LOCAL, &sDefault.bShortCasePreserve,
+	 NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
+	{"mangle case", P_BOOL, P_LOCAL, &sDefault.bCaseMangle, NULL, NULL,
+	 FLAG_SHARE | FLAG_GLOBAL},
+	{"mangling char", P_CHAR, P_LOCAL, &sDefault.magic_char, NULL, NULL,
+	 FLAG_SHARE | FLAG_GLOBAL},
+	{"hide dot files", P_BOOL, P_LOCAL, &sDefault.bHideDotFiles, NULL,
+	 NULL, FLAG_SHARE | FLAG_GLOBAL},
+	{"delete veto files", P_BOOL, P_LOCAL, &sDefault.bDeleteVetoFiles,
+	 NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
+	{"veto files", P_STRING, P_LOCAL, &sDefault.szVetoFiles, NULL, NULL,
+	 FLAG_SHARE | FLAG_GLOBAL | FLAG_DOS_STRING},
+	{"hide files", P_STRING, P_LOCAL, &sDefault.szHideFiles, NULL, NULL,
+	 FLAG_SHARE | FLAG_GLOBAL | FLAG_DOS_STRING},
+	{"veto oplock files", P_STRING, P_LOCAL, &sDefault.szVetoOplockFiles,
+	 NULL, NULL, FLAG_SHARE | FLAG_GLOBAL | FLAG_DOS_STRING},
+	{"map system", P_BOOL, P_LOCAL, &sDefault.bMap_system, NULL, NULL,
+	 FLAG_SHARE | FLAG_GLOBAL},
+	{"map hidden", P_BOOL, P_LOCAL, &sDefault.bMap_hidden, NULL, NULL,
+	 FLAG_SHARE | FLAG_GLOBAL},
+	{"map archive", P_BOOL, P_LOCAL, &sDefault.bMap_archive, NULL, NULL,
+	 FLAG_SHARE | FLAG_GLOBAL},
+	{"mangled names", P_BOOL, P_LOCAL, &sDefault.bMangledNames, NULL,
+	 NULL, FLAG_SHARE | FLAG_GLOBAL},
+	{"mangled map", P_STRING, P_LOCAL, &sDefault.szMangledMap, NULL, NULL,
+	 FLAG_SHARE | FLAG_GLOBAL},
+	{"stat cache", P_BOOL, P_GLOBAL, &Globals.bStatCache, NULL, NULL, 0},
+
+	{"Domain Options", P_SEP, P_SEPARATOR},
+	
+		{"domain groups", P_STRING, P_GLOBAL, &Globals.szDomainGroups,
+	 NULL, NULL, 0},
+	{"domain admin group", P_STRING, P_GLOBAL,
+	 &Globals.szDomainAdminGroup, NULL, NULL, 0},
+	{"domain guest group", P_STRING, P_GLOBAL,
+	 &Globals.szDomainGuestGroup, NULL, NULL, 0},
+	{"domain admin users", P_STRING, P_GLOBAL,
+	 &Globals.szDomainAdminUsers, NULL, NULL, 0},
+	{"domain guest users", P_STRING, P_GLOBAL,
+	 &Globals.szDomainGuestUsers, NULL, NULL, 0},
 #ifdef USING_GROUPNAME_MAP
-  {"groupname map",     P_STRING, P_GLOBAL, &Globals.szGroupnameMap,     NULL,   NULL,  0},
+	
+		{"groupname map", P_STRING, P_GLOBAL, &Globals.szGroupnameMap,
+	 NULL, NULL, 0},
 #endif /* USING_GROUPNAME_MAP */
-  {"machine password timeout", P_INTEGER, P_GLOBAL, &Globals.machine_password_timeout,  NULL,   NULL,  0},
-
-  {"Logon Options", P_SEP, P_SEPARATOR},
-  {"add user script",  P_STRING,  P_GLOBAL, &Globals.szAddUserScript,   NULL,   NULL,  0},
-  {"delete user script",P_STRING, P_GLOBAL, &Globals.szDelUserScript,   NULL,   NULL,  0},
-  {"logon script",     P_STRING,  P_GLOBAL, &Globals.szLogonScript,     NULL,   NULL,  FLAG_DOS_STRING},
-  {"logon path",       P_STRING,  P_GLOBAL, &Globals.szLogonPath,       NULL,   NULL,  FLAG_DOS_STRING},
-  {"logon drive",      P_STRING,  P_GLOBAL, &Globals.szLogonDrive,      NULL,   NULL,  0},
-  {"logon home",       P_STRING,  P_GLOBAL, &Globals.szLogonHome,       NULL,   NULL,  FLAG_DOS_STRING},
-  {"domain logons",    P_BOOL,    P_GLOBAL, &Globals.bDomainLogons,     NULL,   NULL,  0},
-
-  {"Browse Options", P_SEP, P_SEPARATOR},
-  {"os level",         P_INTEGER, P_GLOBAL, &Globals.os_level,          NULL,   NULL,  FLAG_BASIC},
-  {"lm announce",      P_ENUM,    P_GLOBAL, &Globals.lm_announce,       NULL,   enum_lm_announce, 0},
-  {"lm interval",      P_INTEGER, P_GLOBAL, &Globals.lm_interval,       NULL,   NULL,  0},
-  {"preferred master", P_BOOL,    P_GLOBAL, &Globals.bPreferredMaster,  NULL,   NULL,  FLAG_BASIC},
-  {"prefered master",  P_BOOL,    P_GLOBAL, &Globals.bPreferredMaster,  NULL,   NULL,  0},
-  {"local master",     P_BOOL,    P_GLOBAL, &Globals.bLocalMaster,      NULL,   NULL,  FLAG_BASIC},
-  {"domain master",    P_BOOL,    P_GLOBAL, &Globals.bDomainMaster,     NULL,   NULL,  FLAG_BASIC},
-  {"browse list",      P_BOOL,    P_GLOBAL, &Globals.bBrowseList,       NULL,   NULL,  0},
-  {"browseable",       P_BOOL,    P_LOCAL,  &sDefault.bBrowseable,      NULL,   NULL,  FLAG_BASIC|FLAG_SHARE|FLAG_PRINT},
-  {"browsable",        P_BOOL,    P_LOCAL,  &sDefault.bBrowseable,      NULL,   NULL,  0},
-
-  {"WINS Options", P_SEP, P_SEPARATOR},
-  {"dns proxy",        P_BOOL,    P_GLOBAL, &Globals.bDNSproxy,         NULL,   NULL,  0},
-  {"wins proxy",       P_BOOL,    P_GLOBAL, &Globals.bWINSproxy,        NULL,   NULL,  0},
-  {"wins server",      P_STRING,  P_GLOBAL, &Globals.szWINSserver,      NULL,   NULL,  FLAG_BASIC},
-  {"wins support",     P_BOOL,    P_GLOBAL, &Globals.bWINSsupport,      NULL,   NULL,  FLAG_BASIC},
-  {"wins hook",        P_STRING,  P_GLOBAL, &Globals.szWINSHook, NULL,   NULL,  0},
-
-  {"Locking Options", P_SEP, P_SEPARATOR},
-  {"blocking locks",   P_BOOL,    P_LOCAL,  &sDefault.bBlockingLocks,    NULL,   NULL,  FLAG_SHARE|FLAG_GLOBAL},
-  {"fake oplocks",     P_BOOL,    P_LOCAL,  &sDefault.bFakeOplocks,     NULL,   NULL,  FLAG_SHARE},
-  {"kernel oplocks",   P_BOOL,    P_GLOBAL, &Globals.bKernelOplocks,    NULL,   NULL,  FLAG_GLOBAL},
-  {"locking",          P_BOOL,    P_LOCAL,  &sDefault.bLocking,         NULL,   NULL,  FLAG_SHARE|FLAG_GLOBAL},
+	
+		{"machine password timeout", P_INTEGER, P_GLOBAL,
+	 &Globals.machine_password_timeout, NULL, NULL, 0},
+
+	{"Logon Options", P_SEP, P_SEPARATOR},
+	
+		{"add user script", P_STRING, P_GLOBAL,
+	 &Globals.szAddUserScript, NULL, NULL, 0},
+	{"delete user script", P_STRING, P_GLOBAL, &Globals.szDelUserScript,
+	 NULL, NULL, 0},
+	{"logon script", P_STRING, P_GLOBAL, &Globals.szLogonScript, NULL,
+	 NULL, FLAG_DOS_STRING},
+	{"logon path", P_STRING, P_GLOBAL, &Globals.szLogonPath, NULL, NULL,
+	 FLAG_DOS_STRING},
+	{"logon drive", P_STRING, P_GLOBAL, &Globals.szLogonDrive, NULL, NULL,
+	 0},
+	{"logon home", P_STRING, P_GLOBAL, &Globals.szLogonHome, NULL, NULL,
+	 FLAG_DOS_STRING},
+	{"domain logons", P_BOOL, P_GLOBAL, &Globals.bDomainLogons, NULL,
+	 NULL, 0},
+
+	{"Browse Options", P_SEP, P_SEPARATOR},
+	
+		{"os level", P_INTEGER, P_GLOBAL, &Globals.os_level, NULL,
+	 NULL, FLAG_BASIC},
+	{"lm announce", P_ENUM, P_GLOBAL, &Globals.lm_announce, NULL,
+	 enum_bool_auto, 0},
+	{"lm interval", P_INTEGER, P_GLOBAL, &Globals.lm_interval, NULL, NULL,
+	 0},
+	{"preferred master", P_ENUM, P_GLOBAL, &Globals.bPreferredMaster,
+	 NULL, enum_bool_auto, FLAG_BASIC},
+	{"prefered master", P_ENUM, P_GLOBAL, &Globals.bPreferredMaster, NULL,
+	 enum_bool_auto, FLAG_HIDE},
+	{"local master", P_BOOL, P_GLOBAL, &Globals.bLocalMaster, NULL, NULL,
+	 FLAG_BASIC},
+	{"domain master", P_ENUM, P_GLOBAL, &Globals.bDomainMaster, NULL,
+	 enum_bool_auto, FLAG_BASIC},
+	{"browse list", P_BOOL, P_GLOBAL, &Globals.bBrowseList, NULL, NULL,
+	 0},
+	{"browseable", P_BOOL, P_LOCAL, &sDefault.bBrowseable, NULL, NULL,
+	 FLAG_BASIC | FLAG_SHARE | FLAG_PRINT},
+	{"browsable", P_BOOL, P_LOCAL, &sDefault.bBrowseable, NULL, NULL, 0},
+
+	{"WINS Options", P_SEP, P_SEPARATOR},
+	{"dns proxy", P_BOOL, P_GLOBAL, &Globals.bDNSproxy, NULL, NULL, 0},
+	{"wins proxy", P_BOOL, P_GLOBAL, &Globals.bWINSproxy, NULL, NULL, 0},
+	
+		{"wins server", P_STRING, P_GLOBAL, &Globals.szWINSserver,
+	 NULL, NULL, FLAG_BASIC},
+	{"wins support", P_BOOL, P_GLOBAL, &Globals.bWINSsupport, NULL, NULL,
+	 FLAG_BASIC},
+	{"wins hook", P_STRING, P_GLOBAL, &Globals.szWINSHook, NULL, NULL, 0},
+
+	{"Locking Options", P_SEP, P_SEPARATOR},
+	
+		{"blocking locks", P_BOOL, P_LOCAL, &sDefault.bBlockingLocks,
+	 NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
+	{"fake oplocks", P_BOOL, P_LOCAL, &sDefault.bFakeOplocks, NULL, NULL,
+	 FLAG_SHARE},
+	{"kernel oplocks", P_BOOL, P_GLOBAL, &Globals.bKernelOplocks, NULL,
+	 NULL, FLAG_GLOBAL},
+	{"locking", P_BOOL, P_LOCAL, &sDefault.bLocking, NULL, NULL,
+	 FLAG_SHARE | FLAG_GLOBAL},
 #ifdef WITH_UTMP
-  {"utmp",             P_BOOL,    P_LOCAL,  &sDefault.bUtmp,            NULL,   NULL,  FLAG_SHARE|FLAG_GLOBAL},
+	
+		{"utmp", P_BOOL, P_LOCAL, &sDefault.bUtmp, NULL, NULL,
+	 FLAG_SHARE | FLAG_GLOBAL},
 #endif
-  {"oplocks",          P_BOOL,    P_LOCAL,  &sDefault.bOpLocks,         NULL,   NULL,  FLAG_SHARE|FLAG_GLOBAL},
-  {"level2 oplocks",   P_BOOL,    P_LOCAL,  &sDefault.bLevel2OpLocks,   NULL,   NULL,  FLAG_SHARE|FLAG_GLOBAL},
-  {"oplock break wait time",P_INTEGER,P_GLOBAL,&Globals.oplock_break_wait_time,NULL,NULL,FLAG_GLOBAL},
-  {"oplock contention limit",P_INTEGER,P_LOCAL,&sDefault.iOplockContentionLimit,NULL,NULL,FLAG_SHARE|FLAG_GLOBAL},
-  {"posix locking",    P_BOOL,    P_LOCAL,  &sDefault.bPosixLocking,    NULL,   NULL,  FLAG_SHARE|FLAG_GLOBAL},
-  {"strict locking",   P_BOOL,    P_LOCAL,  &sDefault.bStrictLocking,   NULL,   NULL,  FLAG_SHARE|FLAG_GLOBAL},
-  {"share modes",      P_BOOL,    P_LOCAL,  &sDefault.bShareModes,      NULL,   NULL,  FLAG_SHARE|FLAG_GLOBAL},
+	
+		{"oplocks", P_BOOL, P_LOCAL, &sDefault.bOpLocks, NULL, NULL,
+	 FLAG_SHARE | FLAG_GLOBAL},
+	{"level2 oplocks", P_BOOL, P_LOCAL, &sDefault.bLevel2OpLocks, NULL,
+	 NULL, FLAG_SHARE | FLAG_GLOBAL},
+	{"oplock break wait time", P_INTEGER, P_GLOBAL,
+	 &Globals.oplock_break_wait_time, NULL, NULL, FLAG_GLOBAL},
+	{"oplock contention limit", P_INTEGER, P_LOCAL,
+	 &sDefault.iOplockContentionLimit, NULL, NULL,
+	 FLAG_SHARE | FLAG_GLOBAL},
+	{"posix locking", P_BOOL, P_LOCAL, &sDefault.bPosixLocking, NULL,
+	 NULL, FLAG_SHARE | FLAG_GLOBAL},
+	{"strict locking", P_BOOL, P_LOCAL, &sDefault.bStrictLocking, NULL,
+	 NULL, FLAG_SHARE | FLAG_GLOBAL},
+	{"share modes", P_BOOL, P_LOCAL, &sDefault.bShareModes, NULL, NULL,
+	 FLAG_SHARE | FLAG_GLOBAL},
 
 #ifdef WITH_LDAP
-  {"Ldap Options", P_SEP, P_SEPARATOR},
-  {"ldap server",      P_STRING,  P_GLOBAL, &Globals.szLdapServer,      NULL,   NULL,  0},
-  {"ldap port",        P_INTEGER, P_GLOBAL, &Globals.ldap_port,         NULL,   NULL,  0},
-  {"ldap suffix",      P_STRING,  P_GLOBAL, &Globals.szLdapSuffix,      NULL,   NULL,  0},
-  {"ldap filter",      P_STRING,  P_GLOBAL, &Globals.szLdapFilter,      NULL,   NULL,  0},
-  {"ldap root",        P_STRING,  P_GLOBAL, &Globals.szLdapRoot,        NULL,   NULL,  0},
-  {"ldap root passwd", P_STRING,  P_GLOBAL, &Globals.szLdapRootPassword,NULL,   NULL,  0},
+	{"Ldap Options", P_SEP, P_SEPARATOR},
+	
+		{"ldap server", P_STRING, P_GLOBAL, &Globals.szLdapServer,
+	 NULL, NULL, 0},
+	{"ldap port", P_INTEGER, P_GLOBAL, &Globals.ldap_port, NULL, NULL, 0},
+	
+		{"ldap suffix", P_STRING, P_GLOBAL, &Globals.szLdapSuffix,
+	 NULL, NULL, 0},
+	{"ldap filter", P_STRING, P_GLOBAL, &Globals.szLdapFilter, NULL, NULL,
+	 0},
+	{"ldap root", P_STRING, P_GLOBAL, &Globals.szLdapRoot, NULL, NULL, 0},
+	
+		{"ldap root passwd", P_STRING, P_GLOBAL,
+	 &Globals.szLdapRootPassword, NULL, NULL, 0},
 #endif /* WITH_LDAP */
 
 
-  {"Miscellaneous Options", P_SEP, P_SEPARATOR},
-  {"smbrun",           P_STRING,  P_GLOBAL, &Globals.szSmbrun,          NULL,   NULL,  0},
-  {"config file",      P_STRING,  P_GLOBAL, &Globals.szConfigFile,      NULL,   NULL,  FLAG_HIDE},
-  {"preload",          P_STRING,  P_GLOBAL, &Globals.szAutoServices,    NULL,   NULL,  0},
-  {"auto services",    P_STRING,  P_GLOBAL, &Globals.szAutoServices,    NULL,   NULL,  0},
-  {"lock dir",         P_STRING,  P_GLOBAL, &Globals.szLockDir,         NULL,   NULL,  0},
-  {"lock directory",   P_STRING,  P_GLOBAL, &Globals.szLockDir,         NULL,   NULL,  0},
+	{"Miscellaneous Options", P_SEP, P_SEPARATOR},
+	{"smbrun", P_STRING, P_GLOBAL, &Globals.szSmbrun, NULL, NULL, 0},
+	
+		{"config file", P_STRING, P_GLOBAL, &Globals.szConfigFile,
+	 NULL, NULL, FLAG_HIDE},
+	{"preload", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL,
+	 0},
+	{"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL,
+	 NULL, 0},
+	{"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0},
+	
+		{"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir,
+	 NULL, NULL, 0},
 #ifdef WITH_UTMP
-  {"utmp dir",         P_STRING,  P_GLOBAL, &Globals.szUtmpDir,         NULL,   NULL,  0},
-  {"utmp directory",   P_STRING,  P_GLOBAL, &Globals.szUtmpDir,         NULL,   NULL,  0},
+	{"utmp dir", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, 0},
+	
+		{"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir,
+	 NULL, NULL, 0},
 #endif /* WITH_UTMP */
-  {"default service",  P_STRING,  P_GLOBAL, &Globals.szDefaultService,  NULL,   NULL,  0},
-  {"default",          P_STRING,  P_GLOBAL, &Globals.szDefaultService,  NULL,   NULL,  0},
-  {"message command",  P_STRING,  P_GLOBAL, &Globals.szMsgCommand,      NULL,   NULL,  0},
-  {"dfree command",    P_STRING,  P_GLOBAL, &Globals.szDfree,           NULL,   NULL,  0},
-  {"valid chars",      P_STRING,  P_GLOBAL, &Globals.szValidChars,      handle_valid_chars, NULL,  0},
-  {"remote announce",  P_STRING,  P_GLOBAL, &Globals.szRemoteAnnounce,  NULL,   NULL,  0},
-  {"remote browse sync",P_STRING, P_GLOBAL, &Globals.szRemoteBrowseSync,NULL,   NULL,  0},
-  {"socket address",   P_STRING,  P_GLOBAL, &Globals.szSocketAddress,   NULL,   NULL,  0},
-  {"homedir map",      P_STRING,  P_GLOBAL, &Globals.szNISHomeMapName,  NULL,   NULL,  0},
-  {"time offset",      P_INTEGER, P_GLOBAL, &extra_time_offset,         NULL,   NULL,  0},
-  {"unix realname",    P_BOOL,    P_GLOBAL, &Globals.bUnixRealname,     NULL,   NULL,  0},
-  {"NIS homedir",      P_BOOL,    P_GLOBAL, &Globals.bNISHomeMap,       NULL,   NULL,  0},
-  {"-valid",           P_BOOL,    P_LOCAL,  &sDefault.valid,            NULL,   NULL,  FLAG_HIDE},
-  {"copy",             P_STRING,  P_LOCAL,  &sDefault.szCopy,           handle_copy, NULL,  FLAG_HIDE},
-  {"include",          P_STRING,  P_LOCAL,  &sDefault.szInclude,        handle_include, NULL,  FLAG_HIDE},
-  {"exec",             P_STRING,  P_LOCAL,  &sDefault.szPreExec,        NULL,   NULL,  FLAG_SHARE|FLAG_PRINT},
-  {"preexec",          P_STRING,  P_LOCAL,  &sDefault.szPreExec,        NULL,   NULL,  0},
-  {"preexec close",    P_BOOL,    P_LOCAL,  &sDefault.bPreexecClose,    NULL,   NULL,  FLAG_SHARE},
-  {"postexec",         P_STRING,  P_LOCAL,  &sDefault.szPostExec,       NULL,   NULL,  FLAG_SHARE|FLAG_PRINT},
-  {"root preexec",     P_STRING,  P_LOCAL,  &sDefault.szRootPreExec,    NULL,   NULL,  FLAG_SHARE|FLAG_PRINT},
-  {"root preexec close", P_BOOL,  P_LOCAL,  &sDefault.bRootpreexecClose,NULL,   NULL,  FLAG_SHARE},
-  {"root postexec",    P_STRING,  P_LOCAL,  &sDefault.szRootPostExec,   NULL,   NULL,  FLAG_SHARE|FLAG_PRINT},
-  {"available",        P_BOOL,    P_LOCAL,  &sDefault.bAvailable,       NULL,   NULL,  FLAG_BASIC|FLAG_SHARE|FLAG_PRINT},
-  {"volume",           P_STRING,  P_LOCAL,  &sDefault.volume,           NULL,   NULL,  FLAG_SHARE},
-  {"fstype",           P_STRING,  P_LOCAL,  &sDefault.fstype,           NULL,   NULL,  FLAG_SHARE},
-  {"set directory",    P_BOOLREV, P_LOCAL,  &sDefault.bNo_set_dir,      NULL,   NULL,  FLAG_SHARE},
-  {"source environment",P_STRING, P_GLOBAL, &Globals.szSourceEnv,       handle_source_env,NULL,0},
-  {"wide links",       P_BOOL,    P_LOCAL,  &sDefault.bWidelinks,       NULL,   NULL,  FLAG_SHARE|FLAG_GLOBAL},
-  {"follow symlinks",  P_BOOL,    P_LOCAL,  &sDefault.bSymlinks,        NULL,   NULL,  FLAG_SHARE|FLAG_GLOBAL},
-  {"dont descend",     P_STRING,  P_LOCAL,  &sDefault.szDontdescend,    NULL,   NULL,  FLAG_SHARE},
-  {"magic script",     P_STRING,  P_LOCAL,  &sDefault.szMagicScript,    NULL,   NULL,  FLAG_SHARE},
-  {"magic output",     P_STRING,  P_LOCAL,  &sDefault.szMagicOutput,    NULL,   NULL,  FLAG_SHARE},
-  {"delete readonly",  P_BOOL,    P_LOCAL,  &sDefault.bDeleteReadonly,  NULL,   NULL,  FLAG_SHARE|FLAG_GLOBAL},
-  {"dos filetimes",    P_BOOL,    P_LOCAL,  &sDefault.bDosFiletimes,    NULL,   NULL,  FLAG_SHARE|FLAG_GLOBAL},
-  {"dos filetime resolution",P_BOOL,P_LOCAL,&sDefault.bDosFiletimeResolution,   NULL,  NULL,  FLAG_SHARE|FLAG_GLOBAL},
-  
-  {"fake directory create times", P_BOOL,P_LOCAL,  &sDefault.bFakeDirCreateTimes, NULL,   NULL, FLAG_SHARE|FLAG_GLOBAL},
-  {"panic action",     P_STRING,  P_GLOBAL, &Globals.szPanicAction,     NULL,   NULL,  0},
-
-  {"VFS options", P_SEP, P_SEPARATOR},
-
-  {"vfs object",       P_STRING,  P_LOCAL,  &sDefault.szVfsObjectFile,  handle_vfs_object,   NULL,  0},
-  {"vfs options",      P_STRING,  P_LOCAL,  &sDefault.szVfsOptions,     NULL,   NULL,  0}, 
-
-  {"msdfs root",      P_BOOL,  P_LOCAL,  &sDefault.bMSDfsRoot,        NULL,   NULL,  FLAG_SHARE},
-  {"host msdfs",      P_BOOL,    P_GLOBAL, &Globals.bHostMSDfs,        NULL,   NULL, FLAG_GLOBAL},
-
-  {"Winbind options", P_SEP, P_SEPARATOR},
-
-  {"winbind uid", P_STRING, P_GLOBAL, &Globals.szWinbindUID, handle_winbind_id, NULL, 0},
-  {"winbind gid", P_STRING, P_GLOBAL, &Globals.szWinbindGID, handle_winbind_id, NULL, 0},
-  {"template homedir", P_STRING, P_GLOBAL, &Globals.szTemplateHomedir, NULL, NULL, 0},
-  {"template shell", P_STRING, P_GLOBAL, &Globals.szTemplateShell, NULL, NULL, 0},
-  {"winbind separator", P_STRING, P_GLOBAL, &Globals.szWinbindSeparator, NULL, NULL, 0},
-  {"winbind cache time", P_INTEGER, P_GLOBAL, &Globals.winbind_cache_time, NULL,   NULL, 0},
-
-  {NULL,               P_BOOL,    P_NONE,   NULL,                       NULL,   NULL, 0}
+	
+		{"default service", P_STRING, P_GLOBAL,
+	 &Globals.szDefaultService, NULL, NULL, 0},
+	{"default", P_STRING, P_GLOBAL, &Globals.szDefaultService, NULL, NULL,
+	 0},
+	{"message command", P_STRING, P_GLOBAL, &Globals.szMsgCommand, NULL,
+	 NULL, 0},
+	{"dfree command", P_STRING, P_GLOBAL, &Globals.szDfree, NULL, NULL,
+	 0},
+	{"valid chars", P_STRING, P_GLOBAL, &Globals.szValidChars,
+	 handle_valid_chars, NULL, 0},
+	{"remote announce", P_STRING, P_GLOBAL, &Globals.szRemoteAnnounce,
+	 NULL, NULL, 0},
+	{"remote browse sync", P_STRING, P_GLOBAL,
+	 &Globals.szRemoteBrowseSync, NULL, NULL, 0},
+	{"socket address", P_STRING, P_GLOBAL, &Globals.szSocketAddress, NULL,
+	 NULL, 0},
+	{"homedir map", P_STRING, P_GLOBAL, &Globals.szNISHomeMapName, NULL,
+	 NULL, 0},
+	{"time offset", P_INTEGER, P_GLOBAL, &extra_time_offset, NULL, NULL,
+	 0},
+	{"unix realname", P_BOOL, P_GLOBAL, &Globals.bUnixRealname, NULL,
+	 NULL, 0},
+	{"NIS homedir", P_BOOL, P_GLOBAL, &Globals.bNISHomeMap, NULL, NULL,
+	 0},
+	{"-valid", P_BOOL, P_LOCAL, &sDefault.valid, NULL, NULL, FLAG_HIDE},
+	
+		{"copy", P_STRING, P_LOCAL, &sDefault.szCopy, handle_copy,
+	 NULL, FLAG_HIDE},
+	{"include", P_STRING, P_LOCAL, &sDefault.szInclude, handle_include,
+	 NULL, FLAG_HIDE},
+	{"exec", P_STRING, P_LOCAL, &sDefault.szPreExec, NULL, NULL,
+	 FLAG_SHARE | FLAG_PRINT},
+	{"preexec", P_STRING, P_LOCAL, &sDefault.szPreExec, NULL, NULL, 0},
+	
+		{"preexec close", P_BOOL, P_LOCAL, &sDefault.bPreexecClose,
+	 NULL, NULL, FLAG_SHARE},
+	{"postexec", P_STRING, P_LOCAL, &sDefault.szPostExec, NULL, NULL,
+	 FLAG_SHARE | FLAG_PRINT},
+	{"root preexec", P_STRING, P_LOCAL, &sDefault.szRootPreExec, NULL,
+	 NULL, FLAG_SHARE | FLAG_PRINT},
+	{"root preexec close", P_BOOL, P_LOCAL, &sDefault.bRootpreexecClose,
+	 NULL, NULL, FLAG_SHARE},
+	{"root postexec", P_STRING, P_LOCAL, &sDefault.szRootPostExec, NULL,
+	 NULL, FLAG_SHARE | FLAG_PRINT},
+	{"available", P_BOOL, P_LOCAL, &sDefault.bAvailable, NULL, NULL,
+	 FLAG_BASIC | FLAG_SHARE | FLAG_PRINT},
+	{"volume", P_STRING, P_LOCAL, &sDefault.volume, NULL, NULL,
+	 FLAG_SHARE},
+	{"fstype", P_STRING, P_LOCAL, &sDefault.fstype, NULL, NULL,
+	 FLAG_SHARE},
+	{"set directory", P_BOOLREV, P_LOCAL, &sDefault.bNo_set_dir, NULL,
+	 NULL, FLAG_SHARE},
+	{"source environment", P_STRING, P_GLOBAL, &Globals.szSourceEnv,
+	 handle_source_env, NULL, 0},
+	{"wide links", P_BOOL, P_LOCAL, &sDefault.bWidelinks, NULL, NULL,
+	 FLAG_SHARE | FLAG_GLOBAL},
+	{"follow symlinks", P_BOOL, P_LOCAL, &sDefault.bSymlinks, NULL, NULL,
+	 FLAG_SHARE | FLAG_GLOBAL},
+	{"dont descend", P_STRING, P_LOCAL, &sDefault.szDontdescend, NULL,
+	 NULL, FLAG_SHARE},
+	{"magic script", P_STRING, P_LOCAL, &sDefault.szMagicScript, NULL,
+	 NULL, FLAG_SHARE},
+	{"magic output", P_STRING, P_LOCAL, &sDefault.szMagicOutput, NULL,
+	 NULL, FLAG_SHARE},
+	{"delete readonly", P_BOOL, P_LOCAL, &sDefault.bDeleteReadonly, NULL,
+	 NULL, FLAG_SHARE | FLAG_GLOBAL},
+	{"dos filetimes", P_BOOL, P_LOCAL, &sDefault.bDosFiletimes, NULL,
+	 NULL, FLAG_SHARE | FLAG_GLOBAL},
+	{"dos filetime resolution", P_BOOL, P_LOCAL,
+	 &sDefault.bDosFiletimeResolution, NULL, NULL,
+	 FLAG_SHARE | FLAG_GLOBAL},
+
+	
+		{"fake directory create times", P_BOOL, P_LOCAL,
+	 &sDefault.bFakeDirCreateTimes, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
+	{"panic action", P_STRING, P_GLOBAL, &Globals.szPanicAction, NULL,
+	 NULL, 0},
+
+	{"VFS options", P_SEP, P_SEPARATOR},
+
+	
+		{"vfs object", P_STRING, P_LOCAL, &sDefault.szVfsObjectFile,
+	 handle_vfs_object, NULL, 0},
+	{"vfs options", P_STRING, P_LOCAL, &sDefault.szVfsOptions, NULL, NULL,
+	 0},
+
+	
+		{"msdfs root", P_BOOL, P_LOCAL, &sDefault.bMSDfsRoot, NULL,
+	 NULL, FLAG_SHARE},
+	{"host msdfs", P_BOOL, P_GLOBAL, &Globals.bHostMSDfs, NULL, NULL,
+	 FLAG_GLOBAL},
+
+	{"Winbind options", P_SEP, P_SEPARATOR},
+
+	
+		{"winbind uid", P_STRING, P_GLOBAL, &Globals.szWinbindUID,
+	 handle_winbind_id, NULL, 0},
+	{"winbind gid", P_STRING, P_GLOBAL, &Globals.szWinbindGID,
+	 handle_winbind_id, NULL, 0},
+	{"template homedir", P_STRING, P_GLOBAL, &Globals.szTemplateHomedir,
+	 NULL, NULL, 0},
+	{"template shell", P_STRING, P_GLOBAL, &Globals.szTemplateShell, NULL,
+	 NULL, 0},
+	{"winbind separator", P_STRING, P_GLOBAL, &Globals.szWinbindSeparator,
+	 NULL, NULL, 0},
+	{"winbind cache time", P_INTEGER, P_GLOBAL,
+	 &Globals.winbind_cache_time, NULL, NULL, 0},
+
+	{NULL, P_BOOL, P_NONE, NULL, NULL, NULL, 0}
 };
 
 
@@ -908,147 +1212,148 @@ Initialise the global parameter structure.
 ***************************************************************************/
 static void init_globals(void)
 {
-  static BOOL done_init = False;
-  pstring s;
-
-  if (!done_init)
-    {
-      int i;
-      memset((void *)&Globals,'\0',sizeof(Globals));
-
-      for (i = 0; parm_table[i].label; i++) 
-	if ((parm_table[i].type == P_STRING ||
-	     parm_table[i].type == P_USTRING) && 
-	    parm_table[i].ptr)
-	  string_set(parm_table[i].ptr,"");
-
-      string_set(&sDefault.szGuestaccount, GUEST_ACCOUNT);
-      string_set(&sDefault.szPrinterDriver, "NULL");
-      string_set(&sDefault.fstype, FSTYPE_STRING);
-
-      done_init = True;
-    }
-
-
-  DEBUG(3,("Initialising global parameters\n"));
-
-  string_set(&Globals.szSMBPasswdFile, SMB_PASSWD_FILE);
-  /*
-   * Allow the default PASSWD_CHAT to be overridden in local.h.
-   */
-  string_set(&Globals.szPasswdChat,DEFAULT_PASSWD_CHAT);
-  string_set(&Globals.szWorkGroup, WORKGROUP);
-  string_set(&Globals.szPasswdProgram, PASSWD_PROGRAM);
-  string_set(&Globals.szPrintcapname, PRINTCAP_NAME);
-  string_set(&Globals.szDriverFile, DRIVERFILE);
-  string_set(&Globals.szNtForms, FORMSFILE);
-  string_set(&Globals.szNtDriverFile, NTDRIVERSDIR);
-  string_set(&Globals.szLockDir, LOCKDIR);
-  string_set(&Globals.szRootdir, "/");
+	static BOOL done_init = False;
+	pstring s;
+
+	if (!done_init)
+	{
+		int i;
+		memset((void *)&Globals, '\0', sizeof(Globals));
+
+		for (i = 0; parm_table[i].label; i++)
+			if ((parm_table[i].type == P_STRING ||
+			     parm_table[i].type == P_USTRING) &&
+			    parm_table[i].ptr)
+				string_set(parm_table[i].ptr, "");
+
+		string_set(&sDefault.szGuestaccount, GUEST_ACCOUNT);
+		string_set(&sDefault.szPrinterDriver, "NULL");
+		string_set(&sDefault.fstype, FSTYPE_STRING);
+
+		done_init = True;
+	}
+
+
+	DEBUG(3, ("Initialising global parameters\n"));
+
+	string_set(&Globals.szSMBPasswdFile, SMB_PASSWD_FILE);
+	/*
+	 * Allow the default PASSWD_CHAT to be overridden in local.h.
+	 */
+	string_set(&Globals.szPasswdChat, DEFAULT_PASSWD_CHAT);
+	string_set(&Globals.szWorkGroup, WORKGROUP);
+	string_set(&Globals.szPasswdProgram, PASSWD_PROGRAM);
+	string_set(&Globals.szPrintcapname, PRINTCAP_NAME);
+	string_set(&Globals.szDriverFile, DRIVERFILE);
+	string_set(&Globals.szNtForms, FORMSFILE);
+	string_set(&Globals.szNtDriverFile, NTDRIVERSDIR);
+	string_set(&Globals.szLockDir, LOCKDIR);
+	string_set(&Globals.szRootdir, "/");
 #ifdef WITH_UTMP
-  string_set(&Globals.szUtmpDir, "");
+	string_set(&Globals.szUtmpDir, "");
 #endif /* WITH_UTMP */
-  string_set(&Globals.szSmbrun, SMBRUN);
-  string_set(&Globals.szSocketAddress, "0.0.0.0");
-  pstrcpy(s, "Samba ");
-  pstrcat(s, VERSION);
-  string_set(&Globals.szServerString,s);
-  slprintf(s,sizeof(s)-1, "%d.%d", DEFAULT_MAJOR_VERSION, DEFAULT_MINOR_VERSION);
-  string_set(&Globals.szAnnounceVersion,s);
-
-  pstrcpy(user_socket_options, DEFAULT_SOCKET_OPTIONS);
-
-  string_set(&Globals.szLogonDrive, "");
-  /* %N is the NIS auto.home server if -DAUTOHOME is used, else same as %L */
-  string_set(&Globals.szLogonHome, "\\\\%N\\%U");
-  string_set(&Globals.szLogonPath, "\\\\%N\\%U\\profile");
-
-  string_set(&Globals.szNameResolveOrder, "lmhosts host wins bcast");
-
-  Globals.bLoadPrinters = True;
-  Globals.bUseRhosts = False;
-  Globals.max_packet = 65535;
-  Globals.mangled_stack = 50;
-  Globals.max_xmit = 65535;
-  Globals.max_mux = 50; /* This is *needed* for profile support. */
-  Globals.lpqcachetime = 10;
-  Globals.pwordlevel = 0;
-  Globals.unamelevel = 0;
-  Globals.deadtime = 0;
-  Globals.max_log_size = 5000;
-  Globals.max_open_files = MAX_OPEN_FILES;
-  Globals.maxprotocol = PROTOCOL_NT1;
-  Globals.security = SEC_USER;
-  Globals.bEncryptPasswords = False;
-  Globals.bUpdateEncrypt = False;
-  Globals.bReadRaw = True;
-  Globals.bWriteRaw = True;
-  Globals.bReadPrediction = False;
-  Globals.bReadbmpx = False;
-  Globals.bNullPasswords = False;
-  Globals.bStripDot = False;
-  Globals.syslog = 1;
-  Globals.bSyslogOnly = False;
-  Globals.bTimestampLogs = False;
-  Globals.bDebugHiresTimestamp = False;
-  Globals.bDebugPid = False;
-  Globals.bDebugUid = False;
-  Globals.max_ttl = 60*60*24*3; /* 3 days default. */
-  Globals.max_wins_ttl = 60*60*24*6; /* 6 days default. */
-  Globals.min_wins_ttl = 60*60*6; /* 6 hours default. */
-  Globals.machine_password_timeout = 60*60*24*7; /* 7 days default. */
-  Globals.change_notify_timeout = 60; /* 1 minute default. */
-  Globals.ReadSize = 16*1024;
-  Globals.lm_announce = 2;   /* = Auto: send only if LM clients found */
-  Globals.lm_interval = 60;
-  Globals.shmem_size = SHMEM_SIZE;
-  Globals.stat_cache_size = 50; /* Number of stat translations we'll keep */
-  Globals.announce_as = ANNOUNCE_AS_NT_SERVER;
-  Globals.bUnixRealname = True;
+	string_set(&Globals.szSmbrun, SMBRUN);
+	string_set(&Globals.szSocketAddress, "0.0.0.0");
+	pstrcpy(s, "Samba ");
+	pstrcat(s, VERSION);
+	string_set(&Globals.szServerString, s);
+	slprintf(s, sizeof(s) - 1, "%d.%d", DEFAULT_MAJOR_VERSION,
+		 DEFAULT_MINOR_VERSION);
+	string_set(&Globals.szAnnounceVersion, s);
+
+	pstrcpy(user_socket_options, DEFAULT_SOCKET_OPTIONS);
+
+	string_set(&Globals.szLogonDrive, "");
+	/* %N is the NIS auto.home server if -DAUTOHOME is used, else same as %L */
+	string_set(&Globals.szLogonHome, "\\\\%N\\%U");
+	string_set(&Globals.szLogonPath, "\\\\%N\\%U\\profile");
+
+	string_set(&Globals.szNameResolveOrder, "lmhosts host wins bcast");
+
+	Globals.bLoadPrinters = True;
+	Globals.bUseRhosts = False;
+	Globals.max_packet = 65535;
+	Globals.mangled_stack = 50;
+	Globals.max_xmit = 65535;
+	Globals.max_mux = 50;	/* This is *needed* for profile support. */
+	Globals.lpqcachetime = 10;
+	Globals.pwordlevel = 0;
+	Globals.unamelevel = 0;
+	Globals.deadtime = 0;
+	Globals.max_log_size = 5000;
+	Globals.max_open_files = MAX_OPEN_FILES;
+	Globals.maxprotocol = PROTOCOL_NT1;
+	Globals.security = SEC_USER;
+	Globals.bEncryptPasswords = False;
+	Globals.bUpdateEncrypt = False;
+	Globals.bReadRaw = True;
+	Globals.bWriteRaw = True;
+	Globals.bReadPrediction = False;
+	Globals.bReadbmpx = False;
+	Globals.bNullPasswords = False;
+	Globals.bStripDot = False;
+	Globals.syslog = 1;
+	Globals.bSyslogOnly = False;
+	Globals.bTimestampLogs = False;
+	Globals.bDebugHiresTimestamp = False;
+	Globals.bDebugPid = False;
+	Globals.bDebugUid = False;
+	Globals.max_ttl = 60 * 60 * 24 * 3;	/* 3 days default. */
+	Globals.max_wins_ttl = 60 * 60 * 24 * 6;	/* 6 days default. */
+	Globals.min_wins_ttl = 60 * 60 * 6;	/* 6 hours default. */
+	Globals.machine_password_timeout = 60 * 60 * 24 * 7;	/* 7 days default. */
+	Globals.change_notify_timeout = 60;	/* 1 minute default. */
+	Globals.ReadSize = 16 * 1024;
+	Globals.lm_announce = 2;	/* = Auto: send only if LM clients found */
+	Globals.lm_interval = 60;
+	Globals.shmem_size = SHMEM_SIZE;
+	Globals.stat_cache_size = 50;	/* Number of stat translations we'll keep */
+	Globals.announce_as = ANNOUNCE_AS_NT_SERVER;
+	Globals.bUnixRealname = True;
 #if (defined(HAVE_NETGROUP) && defined(WITH_AUTOMOUNT))
-  Globals.bNISHomeMap = False;
+	Globals.bNISHomeMap = False;
 #ifdef WITH_NISPLUS_HOME
-  string_set(&Globals.szNISHomeMapName, "auto_home.org_dir");
+	string_set(&Globals.szNISHomeMapName, "auto_home.org_dir");
 #else
-  string_set(&Globals.szNISHomeMapName, "auto.home");
+	string_set(&Globals.szNISHomeMapName, "auto.home");
 #endif
 #endif
-  Globals.client_code_page = DEFAULT_CLIENT_CODE_PAGE;
-  Globals.bTimeServer = False;
-  Globals.bBindInterfacesOnly = False;
-  Globals.bUnixPasswdSync = False;
-  Globals.bPasswdChatDebug = False;
-  Globals.bNTSmbSupport = True; /* Do NT SMB's by default. */
-  Globals.bNTPipeSupport = True; /* Do NT pipes by default. */
-  Globals.bNTAclSupport = True; /* Use NT ACLs by default. */
-  Globals.bStatCache = True; /* use stat cache by default */
-  Globals.bRestrictAnonymous = False;
-  Globals.map_to_guest = 0; /* By Default, "Never" */
-  Globals.min_passwd_length = MINPASSWDLENGTH; /* By Default, 5. */
-  Globals.oplock_break_wait_time = 10; /* By Default, 10 msecs. */
+	Globals.client_code_page = DEFAULT_CLIENT_CODE_PAGE;
+	Globals.bTimeServer = False;
+	Globals.bBindInterfacesOnly = False;
+	Globals.bUnixPasswdSync = False;
+	Globals.bPasswdChatDebug = False;
+	Globals.bNTSmbSupport = True;	/* Do NT SMB's by default. */
+	Globals.bNTPipeSupport = True;	/* Do NT pipes by default. */
+	Globals.bNTAclSupport = True;	/* Use NT ACLs by default. */
+	Globals.bStatCache = True;	/* use stat cache by default */
+	Globals.bRestrictAnonymous = False;
+	Globals.map_to_guest = 0;	/* By Default, "Never" */
+	Globals.min_passwd_length = MINPASSWDLENGTH;	/* By Default, 5. */
+	Globals.oplock_break_wait_time = 10;	/* By Default, 10 msecs. */
 
 #ifdef WITH_LDAP
-  /* default values for ldap */
-  string_set(&Globals.szLdapServer, "localhost");
-  Globals.ldap_port=389;
+	/* default values for ldap */
+	string_set(&Globals.szLdapServer, "localhost");
+	Globals.ldap_port = 389;
 #endif /* WITH_LDAP */
 
 #ifdef WITH_SSL
-  Globals.sslVersion = SMB_SSL_V23;
-  string_set(&Globals.sslHostsRequire, "");
-  string_set(&Globals.sslHostsResign, "");
-  string_set(&Globals.sslCaCertDir, "");
-  string_set(&Globals.sslCaCertFile, "");
-  string_set(&Globals.sslCert, "");
-  string_set(&Globals.sslPrivKey, "");
-  string_set(&Globals.sslClientCert, "");
-  string_set(&Globals.sslClientPrivKey, "");
-  string_set(&Globals.sslCiphers, "");
-  Globals.sslEnabled = False;
-  Globals.sslReqClientCert = False;
-  Globals.sslReqServerCert = False;
-  Globals.sslCompatibility = False;
-#endif        /* WITH_SSL */
+	Globals.sslVersion = SMB_SSL_V23;
+	string_set(&Globals.sslHostsRequire, "");
+	string_set(&Globals.sslHostsResign, "");
+	string_set(&Globals.sslCaCertDir, "");
+	string_set(&Globals.sslCaCertFile, "");
+	string_set(&Globals.sslCert, "");
+	string_set(&Globals.sslPrivKey, "");
+	string_set(&Globals.sslClientCert, "");
+	string_set(&Globals.sslClientPrivKey, "");
+	string_set(&Globals.sslCiphers, "");
+	Globals.sslEnabled = False;
+	Globals.sslReqClientCert = False;
+	Globals.sslReqServerCert = False;
+	Globals.sslCompatibility = False;
+#endif /* WITH_SSL */
 
 /* these parameters are set to defaults that are more appropriate
    for the increasing samba install base:
@@ -1062,36 +1367,36 @@ static void init_globals(void)
 
 */
 
-  Globals.os_level = 20;
-  Globals.bPreferredMaster = False;
-  Globals.bLocalMaster = True;
-  Globals.bDomainMaster = False;
-  Globals.bDomainLogons = False;
-  Globals.bBrowseList = True;
-  Globals.bWINSsupport = False;
-  Globals.bWINSproxy = False;
+	Globals.bPreferredMaster = Auto;	/* depending on bDomainMaster */
+	Globals.os_level = 20;
+	Globals.bLocalMaster = True;
+	Globals.bDomainMaster = Auto;	/* depending on bDomainLogons */
+	Globals.bDomainLogons = False;
+	Globals.bBrowseList = True;
+	Globals.bWINSsupport = False;
+	Globals.bWINSproxy = False;
 
-  Globals.bDNSproxy = True;
+	Globals.bDNSproxy = True;
 
-  /*
-   * smbd will check at runtime to see if this value
-   * will really be used or not.
-   */
-  Globals.bKernelOplocks = True;
+	/*
+	 * smbd will check at runtime to see if this value
+	 * will really be used or not.
+	 */
+	Globals.bKernelOplocks = True;
 
-  Globals.bAllowTrustedDomains = True;
+	Globals.bAllowTrustedDomains = True;
 
-  string_set(&Globals.szTemplateShell, "/bin/false");
-  string_set(&Globals.szTemplateHomedir, "/home/%D/%U");
-  string_set(&Globals.szWinbindSeparator, "\\");
-  Globals.winbind_cache_time = 15;
+	string_set(&Globals.szTemplateShell, "/bin/false");
+	string_set(&Globals.szTemplateHomedir, "/home/%D/%U");
+	string_set(&Globals.szWinbindSeparator, "\\");
+	Globals.winbind_cache_time = 15;
 
-  /*
-   * This must be done last as it checks the value in 
-   * client_code_page.
-   */
+	/*
+	 * This must be done last as it checks the value in 
+	 * client_code_page.
+	 */
 
-  interpret_coding_system(KANJI);
+	interpret_coding_system(KANJI);
 }
 
 /***************************************************************************
@@ -1099,63 +1404,83 @@ Initialise the sDefault parameter structure.
 ***************************************************************************/
 static void init_locals(void)
 {
-  /* choose defaults depending on the type of printing */
-  switch (sDefault.iPrinting)
-    {
-    case PRINT_BSD:
-    case PRINT_AIX:
-      string_set(&sDefault.szLpqcommand,"lpq -P%p");
-      string_set(&sDefault.szLprmcommand,"lprm -P%p %j");
-      string_set(&sDefault.szPrintcommand,"lpr -r -P%p %s");
-      break;
-
-    case PRINT_LPRNG:
-    case PRINT_PLP:
-      string_set(&sDefault.szLpqcommand,"lpq -P%p");
-      string_set(&sDefault.szLprmcommand,"lprm -P%p %j");
-      string_set(&sDefault.szPrintcommand,"lpr -r -P%p %s");
-      string_set(&sDefault.szQueuepausecommand, "lpc stop %p");
-      string_set(&sDefault.szQueueresumecommand, "lpc start %p");
-      string_set(&sDefault.szLppausecommand, "lpc hold %p %j");
-      string_set(&sDefault.szLpresumecommand, "lpc release %p %j");
-      break;
-
-    case PRINT_CUPS:
-      string_set(&sDefault.szLpqcommand,"/usr/bin/lpstat -o%p");
-      string_set(&sDefault.szLprmcommand,"/usr/bin/cancel %p-%j");
-      string_set(&sDefault.szPrintcommand,"/usr/bin/lp -d%p -oraw %s; rm %s");
-      string_set(&sDefault.szQueuepausecommand, "/usr/bin/disable %p");
-      string_set(&sDefault.szQueueresumecommand, "/usr/bin/enable %p");
-      break;
-
-    case PRINT_SYSV:
-    case PRINT_HPUX:
-      string_set(&sDefault.szLpqcommand,"lpstat -o%p");
-      string_set(&sDefault.szLprmcommand,"cancel %p-%j");
-      string_set(&sDefault.szPrintcommand,"lp -c -d%p %s; rm %s");
-      string_set(&sDefault.szQueuepausecommand, "disable %p");
-      string_set(&sDefault.szQueueresumecommand, "enable %p");
+	/* choose defaults depending on the type of printing */
+	switch (sDefault.iPrinting)
+	{
+		case PRINT_BSD:
+		case PRINT_AIX:
+			string_set(&sDefault.szLpqcommand, "lpq -P%p");
+			string_set(&sDefault.szLprmcommand, "lprm -P%p %j");
+			string_set(&sDefault.szPrintcommand,
+				   "lpr -r -P%p %s");
+			break;
+
+		case PRINT_LPRNG:
+		case PRINT_PLP:
+			string_set(&sDefault.szLpqcommand, "lpq -P%p");
+			string_set(&sDefault.szLprmcommand, "lprm -P%p %j");
+			string_set(&sDefault.szPrintcommand,
+				   "lpr -r -P%p %s");
+			string_set(&sDefault.szQueuepausecommand,
+				   "lpc stop %p");
+			string_set(&sDefault.szQueueresumecommand,
+				   "lpc start %p");
+			string_set(&sDefault.szLppausecommand,
+				   "lpc hold %p %j");
+			string_set(&sDefault.szLpresumecommand,
+				   "lpc release %p %j");
+			break;
+
+		case PRINT_CUPS:
+			string_set(&sDefault.szLpqcommand,
+				   "/usr/bin/lpstat -o%p");
+			string_set(&sDefault.szLprmcommand,
+				   "/usr/bin/cancel %p-%j");
+			string_set(&sDefault.szPrintcommand,
+				   "/usr/bin/lp -d%p -oraw %s; rm %s");
+			string_set(&sDefault.szQueuepausecommand,
+				   "/usr/bin/disable %p");
+			string_set(&sDefault.szQueueresumecommand,
+				   "/usr/bin/enable %p");
+			break;
+
+		case PRINT_SYSV:
+		case PRINT_HPUX:
+			string_set(&sDefault.szLpqcommand, "lpstat -o%p");
+			string_set(&sDefault.szLprmcommand, "cancel %p-%j");
+			string_set(&sDefault.szPrintcommand,
+				   "lp -c -d%p %s; rm %s");
+			string_set(&sDefault.szQueuepausecommand,
+				   "disable %p");
+			string_set(&sDefault.szQueueresumecommand,
+				   "enable %p");
 #ifndef HPUX
-      string_set(&sDefault.szLppausecommand,"lp -i %p-%j -H hold");
-      string_set(&sDefault.szLpresumecommand,"lp -i %p-%j -H resume");
+			string_set(&sDefault.szLppausecommand,
+				   "lp -i %p-%j -H hold");
+			string_set(&sDefault.szLpresumecommand,
+				   "lp -i %p-%j -H resume");
 #endif /* SYSV */
-      break;
+			break;
+
+		case PRINT_QNX:
+			string_set(&sDefault.szLpqcommand, "lpq -P%p");
+			string_set(&sDefault.szLprmcommand, "lprm -P%p %j");
+			string_set(&sDefault.szPrintcommand, "lp -r -P%p %s");
+			break;
 
-    case PRINT_QNX:
-      string_set(&sDefault.szLpqcommand,"lpq -P%p");
-      string_set(&sDefault.szLprmcommand,"lprm -P%p %j");
-      string_set(&sDefault.szPrintcommand,"lp -r -P%p %s");
-      break;
+		case PRINT_SOFTQ:
+			string_set(&sDefault.szLpqcommand, "qstat -l -d%p");
+			string_set(&sDefault.szLprmcommand,
+				   "qstat -s -j%j -c");
+			string_set(&sDefault.szPrintcommand,
+				   "lp -d%p -s %s; rm %s");
+			string_set(&sDefault.szLppausecommand,
+				   "qstat -s -j%j -h");
+			string_set(&sDefault.szLpresumecommand,
+				   "qstat -s -j%j -r");
+			break;
 
-    case PRINT_SOFTQ:
-      string_set(&sDefault.szLpqcommand,"qstat -l -d%p");
-      string_set(&sDefault.szLprmcommand,"qstat -s -j%j -c");
-      string_set(&sDefault.szPrintcommand,"lp -d%p -s %s; rm %s");
-      string_set(&sDefault.szLppausecommand,"qstat -s -j%j -h");
-      string_set(&sDefault.szLpresumecommand,"qstat -s -j%j -r");
-      break;
-      
-    }
+	}
 }
 
 static TALLOC_CTX *lp_talloc;
@@ -1165,7 +1490,8 @@ free up temporary memory - called from the main loop
 ********************************************************************/
 void lp_talloc_free(void)
 {
-	if (!lp_talloc) return;
+	if (!lp_talloc)
+		return;
 	talloc_destroy(lp_talloc);
 	lp_talloc = NULL;
 }
@@ -1177,24 +1503,26 @@ callers without affecting the source string.
 ********************************************************************/
 static char *lp_string(const char *s)
 {
-	size_t len = s?strlen(s):0;
+	size_t len = s ? strlen(s) : 0;
 	char *ret;
 
-	if (!lp_talloc) lp_talloc = talloc_init();
-  
-	ret = (char *)talloc(lp_talloc, len + 100); /* leave room for substitution */
+	if (!lp_talloc)
+		lp_talloc = talloc_init();
+
+	ret = (char *)talloc(lp_talloc, len + 100);	/* leave room for substitution */
 
-	if (!ret) return NULL;
+	if (!ret)
+		return NULL;
 
-	if (!s) 
+	if (!s)
 		*ret = 0;
 	else
-		StrnCpy(ret,s,len);
+		StrnCpy(ret, s, len);
 
 	trim_string(ret, "\"", "\"");
 
 	standard_sub_basic(ret);
-	return(ret);
+	return (ret);
 }
 
 
@@ -1221,362 +1549,364 @@ static char *lp_string(const char *s)
 #define FN_LOCAL_INTEGER(fn_name,val) \
  int fn_name(int i) {return(LP_SNUM_OK(i)? pSERVICE(i)->val : sDefault.val);}
 
-FN_GLOBAL_STRING(lp_logfile,&Globals.szLogFile)
-FN_GLOBAL_STRING(lp_smbrun,&Globals.szSmbrun)
-FN_GLOBAL_STRING(lp_configfile,&Globals.szConfigFile)
-FN_GLOBAL_STRING(lp_smb_passwd_file,&Globals.szSMBPasswdFile)
-FN_GLOBAL_STRING(lp_serverstring,&Globals.szServerString)
-FN_GLOBAL_STRING(lp_printcapname,&Globals.szPrintcapname)
-FN_GLOBAL_STRING(lp_lockdir,&Globals.szLockDir)
+FN_GLOBAL_STRING(lp_logfile, &Globals.szLogFile)
+FN_GLOBAL_STRING(lp_smbrun, &Globals.szSmbrun)
+FN_GLOBAL_STRING(lp_configfile, &Globals.szConfigFile)
+FN_GLOBAL_STRING(lp_smb_passwd_file, &Globals.szSMBPasswdFile)
+FN_GLOBAL_STRING(lp_serverstring, &Globals.szServerString)
+FN_GLOBAL_STRING(lp_printcapname, &Globals.szPrintcapname)
+FN_GLOBAL_STRING(lp_lockdir, &Globals.szLockDir)
 #ifdef WITH_UTMP
-FN_GLOBAL_STRING(lp_utmpdir,&Globals.szUtmpDir)
+	FN_GLOBAL_STRING(lp_utmpdir, &Globals.szUtmpDir)
 #endif /* WITH_UTMP */
-FN_GLOBAL_STRING(lp_rootdir,&Globals.szRootdir)
-FN_GLOBAL_STRING(lp_source_environment,&Globals.szSourceEnv)
-FN_GLOBAL_STRING(lp_defaultservice,&Globals.szDefaultService)
-FN_GLOBAL_STRING(lp_msg_command,&Globals.szMsgCommand)
-FN_GLOBAL_STRING(lp_dfree_command,&Globals.szDfree)
-FN_GLOBAL_STRING(lp_hosts_equiv,&Globals.szHostsEquiv)
-FN_GLOBAL_STRING(lp_auto_services,&Globals.szAutoServices)
-FN_GLOBAL_STRING(lp_passwd_program,&Globals.szPasswdProgram)
-FN_GLOBAL_STRING(lp_passwd_chat,&Globals.szPasswdChat)
-FN_GLOBAL_STRING(lp_passwordserver,&Globals.szPasswordServer)
-FN_GLOBAL_STRING(lp_name_resolve_order,&Globals.szNameResolveOrder)
-FN_GLOBAL_STRING(lp_workgroup,&Globals.szWorkGroup)
-FN_GLOBAL_STRING(lp_username_map,&Globals.szUsernameMap)
+	FN_GLOBAL_STRING(lp_rootdir, &Globals.szRootdir)
+FN_GLOBAL_STRING(lp_source_environment, &Globals.szSourceEnv)
+FN_GLOBAL_STRING(lp_defaultservice, &Globals.szDefaultService)
+FN_GLOBAL_STRING(lp_msg_command, &Globals.szMsgCommand)
+FN_GLOBAL_STRING(lp_dfree_command, &Globals.szDfree)
+FN_GLOBAL_STRING(lp_hosts_equiv, &Globals.szHostsEquiv)
+FN_GLOBAL_STRING(lp_auto_services, &Globals.szAutoServices)
+FN_GLOBAL_STRING(lp_passwd_program, &Globals.szPasswdProgram)
+FN_GLOBAL_STRING(lp_passwd_chat, &Globals.szPasswdChat)
+FN_GLOBAL_STRING(lp_passwordserver, &Globals.szPasswordServer)
+FN_GLOBAL_STRING(lp_name_resolve_order, &Globals.szNameResolveOrder)
+FN_GLOBAL_STRING(lp_workgroup, &Globals.szWorkGroup)
+FN_GLOBAL_STRING(lp_username_map, &Globals.szUsernameMap)
 #ifdef USING_GROUPNAME_MAP
-FN_GLOBAL_STRING(lp_groupname_map,&Globals.szGroupnameMap)
+	FN_GLOBAL_STRING(lp_groupname_map, &Globals.szGroupnameMap)
 #endif /* USING_GROUPNAME_MAP */
-FN_GLOBAL_STRING(lp_logon_script,&Globals.szLogonScript) 
-FN_GLOBAL_STRING(lp_logon_path,&Globals.szLogonPath) 
-FN_GLOBAL_STRING(lp_logon_drive,&Globals.szLogonDrive) 
-FN_GLOBAL_STRING(lp_logon_home,&Globals.szLogonHome) 
-FN_GLOBAL_STRING(lp_remote_announce,&Globals.szRemoteAnnounce) 
-FN_GLOBAL_STRING(lp_remote_browse_sync,&Globals.szRemoteBrowseSync) 
-FN_GLOBAL_STRING(lp_wins_server,&Globals.szWINSserver)
-FN_GLOBAL_STRING(lp_interfaces,&Globals.szInterfaces)
-FN_GLOBAL_STRING(lp_socket_address,&Globals.szSocketAddress)
-FN_GLOBAL_STRING(lp_nis_home_map_name,&Globals.szNISHomeMapName)
-static FN_GLOBAL_STRING(lp_announce_version,&Globals.szAnnounceVersion)
-FN_GLOBAL_STRING(lp_netbios_aliases,&Globals.szNetbiosAliases)
-FN_GLOBAL_STRING(lp_driverfile,&Globals.szDriverFile)
-FN_GLOBAL_STRING(lp_panic_action,&Globals.szPanicAction)
-FN_GLOBAL_STRING(lp_adduser_script,&Globals.szAddUserScript)
-FN_GLOBAL_STRING(lp_deluser_script,&Globals.szDelUserScript)
-FN_GLOBAL_STRING(lp_wins_hook,&Globals.szWINSHook)
-
-FN_GLOBAL_STRING(lp_domain_groups,&Globals.szDomainGroups)
-FN_GLOBAL_STRING(lp_domain_admin_group,&Globals.szDomainAdminGroup)
-FN_GLOBAL_STRING(lp_domain_guest_group,&Globals.szDomainGuestGroup)
-FN_GLOBAL_STRING(lp_domain_admin_users,&Globals.szDomainAdminUsers)
-FN_GLOBAL_STRING(lp_domain_guest_users,&Globals.szDomainGuestUsers)
-
-FN_GLOBAL_STRING(lp_nt_forms,&Globals.szNtForms)
-FN_GLOBAL_STRING(lp_nt_drivers_file,&Globals.szNtDriverFile)
-
-FN_GLOBAL_STRING(lp_winbind_uid,&Globals.szWinbindUID)
-FN_GLOBAL_STRING(lp_winbind_gid,&Globals.szWinbindGID)
-FN_GLOBAL_STRING(lp_template_homedir,&Globals.szTemplateHomedir)
-FN_GLOBAL_STRING(lp_template_shell,&Globals.szTemplateShell)
-FN_GLOBAL_STRING(lp_winbind_separator,&Globals.szWinbindSeparator)
-
+	FN_GLOBAL_STRING(lp_logon_script, &Globals.szLogonScript)
+FN_GLOBAL_STRING(lp_logon_path, &Globals.szLogonPath)
+FN_GLOBAL_STRING(lp_logon_drive, &Globals.szLogonDrive)
+FN_GLOBAL_STRING(lp_logon_home, &Globals.szLogonHome)
+FN_GLOBAL_STRING(lp_remote_announce, &Globals.szRemoteAnnounce)
+FN_GLOBAL_STRING(lp_remote_browse_sync, &Globals.szRemoteBrowseSync)
+FN_GLOBAL_STRING(lp_wins_server, &Globals.szWINSserver)
+FN_GLOBAL_STRING(lp_interfaces, &Globals.szInterfaces)
+FN_GLOBAL_STRING(lp_socket_address, &Globals.szSocketAddress)
+FN_GLOBAL_STRING(lp_nis_home_map_name, &Globals.szNISHomeMapName)
+     static FN_GLOBAL_STRING(lp_announce_version, &Globals.szAnnounceVersion)
+	FN_GLOBAL_STRING(lp_netbios_aliases, &Globals.szNetbiosAliases)
+FN_GLOBAL_STRING(lp_driverfile, &Globals.szDriverFile)
+FN_GLOBAL_STRING(lp_panic_action, &Globals.szPanicAction)
+FN_GLOBAL_STRING(lp_adduser_script, &Globals.szAddUserScript)
+FN_GLOBAL_STRING(lp_deluser_script, &Globals.szDelUserScript)
+FN_GLOBAL_STRING(lp_wins_hook, &Globals.szWINSHook)
+FN_GLOBAL_STRING(lp_domain_groups, &Globals.szDomainGroups)
+FN_GLOBAL_STRING(lp_domain_admin_group, &Globals.szDomainAdminGroup)
+FN_GLOBAL_STRING(lp_domain_guest_group, &Globals.szDomainGuestGroup)
+FN_GLOBAL_STRING(lp_domain_admin_users, &Globals.szDomainAdminUsers)
+FN_GLOBAL_STRING(lp_domain_guest_users, &Globals.szDomainGuestUsers)
+FN_GLOBAL_STRING(lp_nt_forms, &Globals.szNtForms)
+FN_GLOBAL_STRING(lp_nt_drivers_file, &Globals.szNtDriverFile)
+FN_GLOBAL_STRING(lp_winbind_uid, &Globals.szWinbindUID)
+FN_GLOBAL_STRING(lp_winbind_gid, &Globals.szWinbindGID)
+FN_GLOBAL_STRING(lp_template_homedir, &Globals.szTemplateHomedir)
+FN_GLOBAL_STRING(lp_template_shell, &Globals.szTemplateShell)
+FN_GLOBAL_STRING(lp_winbind_separator, &Globals.szWinbindSeparator)
 #ifdef WITH_LDAP
-FN_GLOBAL_STRING(lp_ldap_server,&Globals.szLdapServer);
-FN_GLOBAL_STRING(lp_ldap_suffix,&Globals.szLdapSuffix);
-FN_GLOBAL_STRING(lp_ldap_filter,&Globals.szLdapFilter);
-FN_GLOBAL_STRING(lp_ldap_root,&Globals.szLdapRoot);
-FN_GLOBAL_STRING(lp_ldap_rootpasswd,&Globals.szLdapRootPassword);
+FN_GLOBAL_STRING(lp_ldap_server, &Globals.szLdapServer);
+FN_GLOBAL_STRING(lp_ldap_suffix, &Globals.szLdapSuffix);
+FN_GLOBAL_STRING(lp_ldap_filter, &Globals.szLdapFilter);
+FN_GLOBAL_STRING(lp_ldap_root, &Globals.szLdapRoot);
+FN_GLOBAL_STRING(lp_ldap_rootpasswd, &Globals.szLdapRootPassword);
 #endif /* WITH_LDAP */
 
 #ifdef WITH_SSL
-FN_GLOBAL_INTEGER(lp_ssl_version,&Globals.sslVersion);
-FN_GLOBAL_STRING(lp_ssl_hosts,&Globals.sslHostsRequire);
-FN_GLOBAL_STRING(lp_ssl_hosts_resign,&Globals.sslHostsResign);
-FN_GLOBAL_STRING(lp_ssl_cacertdir,&Globals.sslCaCertDir);
-FN_GLOBAL_STRING(lp_ssl_cacertfile,&Globals.sslCaCertFile);
-FN_GLOBAL_STRING(lp_ssl_cert,&Globals.sslCert);
-FN_GLOBAL_STRING(lp_ssl_privkey,&Globals.sslPrivKey);
-FN_GLOBAL_STRING(lp_ssl_client_cert,&Globals.sslClientCert);
-FN_GLOBAL_STRING(lp_ssl_client_privkey,&Globals.sslClientPrivKey);
-FN_GLOBAL_STRING(lp_ssl_ciphers,&Globals.sslCiphers);
-FN_GLOBAL_BOOL(lp_ssl_enabled,&Globals.sslEnabled);
-FN_GLOBAL_BOOL(lp_ssl_reqClientCert,&Globals.sslReqClientCert);
-FN_GLOBAL_BOOL(lp_ssl_reqServerCert,&Globals.sslReqServerCert);
-FN_GLOBAL_BOOL(lp_ssl_compatibility,&Globals.sslCompatibility);
-#endif        /* WITH_SSL */
-
-FN_GLOBAL_BOOL(lp_dns_proxy,&Globals.bDNSproxy)
-FN_GLOBAL_BOOL(lp_wins_support,&Globals.bWINSsupport)
-FN_GLOBAL_BOOL(lp_we_are_a_wins_server,&Globals.bWINSsupport)
-FN_GLOBAL_BOOL(lp_wins_proxy,&Globals.bWINSproxy)
-FN_GLOBAL_BOOL(lp_local_master,&Globals.bLocalMaster)
-FN_GLOBAL_BOOL(lp_domain_master,&Globals.bDomainMaster)
-FN_GLOBAL_BOOL(lp_domain_logons,&Globals.bDomainLogons)
-FN_GLOBAL_BOOL(lp_preferred_master,&Globals.bPreferredMaster)
-FN_GLOBAL_BOOL(lp_load_printers,&Globals.bLoadPrinters)
-FN_GLOBAL_BOOL(lp_use_rhosts,&Globals.bUseRhosts)
-FN_GLOBAL_BOOL(lp_readprediction,&Globals.bReadPrediction)
-FN_GLOBAL_BOOL(lp_readbmpx,&Globals.bReadbmpx)
-FN_GLOBAL_BOOL(lp_readraw,&Globals.bReadRaw)
-FN_GLOBAL_BOOL(lp_writeraw,&Globals.bWriteRaw)
-FN_GLOBAL_BOOL(lp_null_passwords,&Globals.bNullPasswords)
-FN_GLOBAL_BOOL(lp_strip_dot,&Globals.bStripDot)
-FN_GLOBAL_BOOL(lp_encrypted_passwords,&Globals.bEncryptPasswords)
-FN_GLOBAL_BOOL(lp_update_encrypted,&Globals.bUpdateEncrypt)
-FN_GLOBAL_BOOL(lp_syslog_only,&Globals.bSyslogOnly)
-FN_GLOBAL_BOOL(lp_timestamp_logs,&Globals.bTimestampLogs)
-FN_GLOBAL_BOOL(lp_debug_hires_timestamp,&Globals.bDebugHiresTimestamp)
-FN_GLOBAL_BOOL(lp_debug_pid,&Globals.bDebugPid)
-FN_GLOBAL_BOOL(lp_debug_uid,&Globals.bDebugUid)
-FN_GLOBAL_BOOL(lp_browse_list,&Globals.bBrowseList)
-FN_GLOBAL_BOOL(lp_unix_realname,&Globals.bUnixRealname)
-FN_GLOBAL_BOOL(lp_nis_home_map,&Globals.bNISHomeMap)
-static FN_GLOBAL_BOOL(lp_time_server,&Globals.bTimeServer)
-FN_GLOBAL_BOOL(lp_bind_interfaces_only,&Globals.bBindInterfacesOnly)
-FN_GLOBAL_BOOL(lp_unix_password_sync,&Globals.bUnixPasswdSync)
-FN_GLOBAL_BOOL(lp_passwd_chat_debug,&Globals.bPasswdChatDebug)
-FN_GLOBAL_BOOL(lp_nt_smb_support,&Globals.bNTSmbSupport)
-FN_GLOBAL_BOOL(lp_nt_pipe_support,&Globals.bNTPipeSupport)
-FN_GLOBAL_BOOL(lp_nt_acl_support,&Globals.bNTAclSupport)
-FN_GLOBAL_BOOL(lp_stat_cache,&Globals.bStatCache)
-FN_GLOBAL_BOOL(lp_allow_trusted_domains,&Globals.bAllowTrustedDomains)
-FN_GLOBAL_BOOL(lp_restrict_anonymous,&Globals.bRestrictAnonymous)
-FN_GLOBAL_BOOL(lp_host_msdfs,&Globals.bHostMSDfs)
-FN_GLOBAL_INTEGER(lp_os_level,&Globals.os_level)
-FN_GLOBAL_INTEGER(lp_max_ttl,&Globals.max_ttl)
-FN_GLOBAL_INTEGER(lp_max_wins_ttl,&Globals.max_wins_ttl)
-FN_GLOBAL_INTEGER(lp_min_wins_ttl,&Globals.max_wins_ttl)
-FN_GLOBAL_INTEGER(lp_max_log_size,&Globals.max_log_size)
-FN_GLOBAL_INTEGER(lp_max_open_files,&Globals.max_open_files)
-FN_GLOBAL_INTEGER(lp_maxxmit,&Globals.max_xmit)
-FN_GLOBAL_INTEGER(lp_maxmux,&Globals.max_mux)
-FN_GLOBAL_INTEGER(lp_passwordlevel,&Globals.pwordlevel)
-FN_GLOBAL_INTEGER(lp_usernamelevel,&Globals.unamelevel)
-FN_GLOBAL_INTEGER(lp_readsize,&Globals.ReadSize)
-FN_GLOBAL_INTEGER(lp_shmem_size,&Globals.shmem_size)
-FN_GLOBAL_INTEGER(lp_deadtime,&Globals.deadtime)
-FN_GLOBAL_INTEGER(lp_maxprotocol,&Globals.maxprotocol)
-FN_GLOBAL_INTEGER(lp_security,&Globals.security)
-FN_GLOBAL_INTEGER(lp_maxdisksize,&Globals.maxdisksize)
-FN_GLOBAL_INTEGER(lp_lpqcachetime,&Globals.lpqcachetime)
-FN_GLOBAL_INTEGER(lp_syslog,&Globals.syslog)
-FN_GLOBAL_INTEGER(lp_client_code_page,&Globals.client_code_page)
-static FN_GLOBAL_INTEGER(lp_announce_as,&Globals.announce_as)
-FN_GLOBAL_INTEGER(lp_lm_announce,&Globals.lm_announce)
-FN_GLOBAL_INTEGER(lp_lm_interval,&Globals.lm_interval)
-FN_GLOBAL_INTEGER(lp_machine_password_timeout,&Globals.machine_password_timeout)
-FN_GLOBAL_INTEGER(lp_change_notify_timeout,&Globals.change_notify_timeout)
-FN_GLOBAL_INTEGER(lp_stat_cache_size,&Globals.stat_cache_size)
-FN_GLOBAL_INTEGER(lp_map_to_guest,&Globals.map_to_guest)
-FN_GLOBAL_INTEGER(lp_min_passwd_length,&Globals.min_passwd_length)
-FN_GLOBAL_INTEGER(lp_oplock_break_wait_time,&Globals.oplock_break_wait_time)
+FN_GLOBAL_INTEGER(lp_ssl_version, &Globals.sslVersion);
+FN_GLOBAL_STRING(lp_ssl_hosts, &Globals.sslHostsRequire);
+FN_GLOBAL_STRING(lp_ssl_hosts_resign, &Globals.sslHostsResign);
+FN_GLOBAL_STRING(lp_ssl_cacertdir, &Globals.sslCaCertDir);
+FN_GLOBAL_STRING(lp_ssl_cacertfile, &Globals.sslCaCertFile);
+FN_GLOBAL_STRING(lp_ssl_cert, &Globals.sslCert);
+FN_GLOBAL_STRING(lp_ssl_privkey, &Globals.sslPrivKey);
+FN_GLOBAL_STRING(lp_ssl_client_cert, &Globals.sslClientCert);
+FN_GLOBAL_STRING(lp_ssl_client_privkey, &Globals.sslClientPrivKey);
+FN_GLOBAL_STRING(lp_ssl_ciphers, &Globals.sslCiphers);
+FN_GLOBAL_BOOL(lp_ssl_enabled, &Globals.sslEnabled);
+FN_GLOBAL_BOOL(lp_ssl_reqClientCert, &Globals.sslReqClientCert);
+FN_GLOBAL_BOOL(lp_ssl_reqServerCert, &Globals.sslReqServerCert);
+FN_GLOBAL_BOOL(lp_ssl_compatibility, &Globals.sslCompatibility);
+#endif /* WITH_SSL */
 
+FN_GLOBAL_BOOL(lp_dns_proxy, &Globals.bDNSproxy)
+FN_GLOBAL_BOOL(lp_wins_support, &Globals.bWINSsupport)
+FN_GLOBAL_BOOL(lp_we_are_a_wins_server, &Globals.bWINSsupport)
+FN_GLOBAL_BOOL(lp_wins_proxy, &Globals.bWINSproxy)
+FN_GLOBAL_BOOL(lp_local_master, &Globals.bLocalMaster)
+FN_GLOBAL_BOOL(lp_domain_logons, &Globals.bDomainLogons)
+FN_GLOBAL_BOOL(lp_load_printers, &Globals.bLoadPrinters)
+FN_GLOBAL_BOOL(lp_use_rhosts, &Globals.bUseRhosts)
+FN_GLOBAL_BOOL(lp_readprediction, &Globals.bReadPrediction)
+FN_GLOBAL_BOOL(lp_readbmpx, &Globals.bReadbmpx)
+FN_GLOBAL_BOOL(lp_readraw, &Globals.bReadRaw)
+FN_GLOBAL_BOOL(lp_writeraw, &Globals.bWriteRaw)
+FN_GLOBAL_BOOL(lp_null_passwords, &Globals.bNullPasswords)
+FN_GLOBAL_BOOL(lp_strip_dot, &Globals.bStripDot)
+FN_GLOBAL_BOOL(lp_encrypted_passwords, &Globals.bEncryptPasswords)
+FN_GLOBAL_BOOL(lp_update_encrypted, &Globals.bUpdateEncrypt)
+FN_GLOBAL_BOOL(lp_syslog_only, &Globals.bSyslogOnly)
+FN_GLOBAL_BOOL(lp_timestamp_logs, &Globals.bTimestampLogs)
+FN_GLOBAL_BOOL(lp_debug_hires_timestamp, &Globals.bDebugHiresTimestamp)
+FN_GLOBAL_BOOL(lp_debug_pid, &Globals.bDebugPid)
+FN_GLOBAL_BOOL(lp_debug_uid, &Globals.bDebugUid)
+FN_GLOBAL_BOOL(lp_browse_list, &Globals.bBrowseList)
+FN_GLOBAL_BOOL(lp_unix_realname, &Globals.bUnixRealname)
+FN_GLOBAL_BOOL(lp_nis_home_map, &Globals.bNISHomeMap)
+     static FN_GLOBAL_BOOL(lp_time_server, &Globals.bTimeServer)
+	FN_GLOBAL_BOOL(lp_bind_interfaces_only, &Globals.bBindInterfacesOnly)
+FN_GLOBAL_BOOL(lp_unix_password_sync, &Globals.bUnixPasswdSync)
+FN_GLOBAL_BOOL(lp_passwd_chat_debug, &Globals.bPasswdChatDebug)
+FN_GLOBAL_BOOL(lp_nt_smb_support, &Globals.bNTSmbSupport)
+FN_GLOBAL_BOOL(lp_nt_pipe_support, &Globals.bNTPipeSupport)
+FN_GLOBAL_BOOL(lp_nt_acl_support, &Globals.bNTAclSupport)
+FN_GLOBAL_BOOL(lp_stat_cache, &Globals.bStatCache)
+FN_GLOBAL_BOOL(lp_allow_trusted_domains, &Globals.bAllowTrustedDomains)
+FN_GLOBAL_BOOL(lp_restrict_anonymous, &Globals.bRestrictAnonymous)
+FN_GLOBAL_BOOL(lp_host_msdfs, &Globals.bHostMSDfs)
+FN_GLOBAL_INTEGER(lp_os_level, &Globals.os_level)
+FN_GLOBAL_INTEGER(lp_max_ttl, &Globals.max_ttl)
+FN_GLOBAL_INTEGER(lp_max_wins_ttl, &Globals.max_wins_ttl)
+FN_GLOBAL_INTEGER(lp_min_wins_ttl, &Globals.max_wins_ttl)
+FN_GLOBAL_INTEGER(lp_max_log_size, &Globals.max_log_size)
+FN_GLOBAL_INTEGER(lp_max_open_files, &Globals.max_open_files)
+FN_GLOBAL_INTEGER(lp_maxxmit, &Globals.max_xmit)
+FN_GLOBAL_INTEGER(lp_maxmux, &Globals.max_mux)
+FN_GLOBAL_INTEGER(lp_passwordlevel, &Globals.pwordlevel)
+FN_GLOBAL_INTEGER(lp_usernamelevel, &Globals.unamelevel)
+FN_GLOBAL_INTEGER(lp_readsize, &Globals.ReadSize)
+FN_GLOBAL_INTEGER(lp_shmem_size, &Globals.shmem_size)
+FN_GLOBAL_INTEGER(lp_deadtime, &Globals.deadtime)
+FN_GLOBAL_INTEGER(lp_maxprotocol, &Globals.maxprotocol)
+FN_GLOBAL_INTEGER(lp_security, &Globals.security)
+FN_GLOBAL_INTEGER(lp_maxdisksize, &Globals.maxdisksize)
+FN_GLOBAL_INTEGER(lp_lpqcachetime, &Globals.lpqcachetime)
+FN_GLOBAL_INTEGER(lp_syslog, &Globals.syslog)
+FN_GLOBAL_INTEGER(lp_client_code_page, &Globals.client_code_page)
+     static FN_GLOBAL_INTEGER(lp_announce_as, &Globals.announce_as)
+	FN_GLOBAL_INTEGER(lp_lm_announce, &Globals.lm_announce)
+FN_GLOBAL_INTEGER(lp_lm_interval, &Globals.lm_interval)
+FN_GLOBAL_INTEGER(lp_machine_password_timeout,
+		  &Globals.
+		  machine_password_timeout)
+FN_GLOBAL_INTEGER(lp_change_notify_timeout,
+		  &Globals.
+		  change_notify_timeout) FN_GLOBAL_INTEGER(lp_stat_cache_size,
+							   &Globals.
+							   stat_cache_size)
+FN_GLOBAL_INTEGER(lp_map_to_guest,
+		  &Globals.
+		  map_to_guest) FN_GLOBAL_INTEGER(lp_min_passwd_length,
+						  &Globals.
+						  min_passwd_length)
+FN_GLOBAL_INTEGER(lp_oplock_break_wait_time, &Globals.oplock_break_wait_time)
 #ifdef WITH_LDAP
-FN_GLOBAL_INTEGER(lp_ldap_port,&Globals.ldap_port)
-#endif /* WITH_LDAP */
-
-FN_LOCAL_STRING(lp_preexec,szPreExec)
-FN_LOCAL_STRING(lp_postexec,szPostExec)
-FN_LOCAL_STRING(lp_rootpreexec,szRootPreExec)
-FN_LOCAL_STRING(lp_rootpostexec,szRootPostExec)
-FN_LOCAL_STRING(lp_servicename,szService)
-FN_LOCAL_STRING(lp_pathname,szPath)
-FN_LOCAL_STRING(lp_dontdescend,szDontdescend)
-FN_LOCAL_STRING(lp_username,szUsername)
-FN_LOCAL_STRING(lp_guestaccount,szGuestaccount)
-FN_LOCAL_STRING(lp_invalid_users,szInvalidUsers)
-FN_LOCAL_STRING(lp_valid_users,szValidUsers)
-FN_LOCAL_STRING(lp_admin_users,szAdminUsers)
-FN_LOCAL_STRING(lp_printcommand,szPrintcommand)
-FN_LOCAL_STRING(lp_lpqcommand,szLpqcommand)
-FN_LOCAL_STRING(lp_lprmcommand,szLprmcommand)
-FN_LOCAL_STRING(lp_lppausecommand,szLppausecommand)
-FN_LOCAL_STRING(lp_lpresumecommand,szLpresumecommand)
-FN_LOCAL_STRING(lp_queuepausecommand,szQueuepausecommand)
-FN_LOCAL_STRING(lp_queueresumecommand,szQueueresumecommand)
-FN_LOCAL_STRING(lp_printername,szPrintername)
-FN_LOCAL_STRING(lp_printerdriver,szPrinterDriver)
-FN_LOCAL_STRING(lp_hostsallow,szHostsallow)
-FN_LOCAL_STRING(lp_hostsdeny,szHostsdeny)
-FN_LOCAL_STRING(lp_magicscript,szMagicScript)
-FN_LOCAL_STRING(lp_magicoutput,szMagicOutput)
-FN_LOCAL_STRING(lp_comment,comment)
-FN_LOCAL_STRING(lp_force_user,force_user)
-FN_LOCAL_STRING(lp_force_group,force_group)
-FN_LOCAL_STRING(lp_readlist,readlist)
-FN_LOCAL_STRING(lp_writelist,writelist)
-FN_LOCAL_STRING(lp_fstype,fstype)
-FN_LOCAL_STRING(lp_vfsobj,szVfsObjectFile)
-static FN_LOCAL_STRING(lp_volume,volume)
-FN_LOCAL_STRING(lp_mangled_map,szMangledMap)
-FN_LOCAL_STRING(lp_veto_files,szVetoFiles)
-FN_LOCAL_STRING(lp_hide_files,szHideFiles)
-FN_LOCAL_STRING(lp_veto_oplocks,szVetoOplockFiles)
-FN_LOCAL_STRING(lp_driverlocation,szPrinterDriverLocation)
+FN_GLOBAL_INTEGER(lp_ldap_port, &Globals.ldap_port)
+#endif				/* WITH_LDAP */
+ FN_LOCAL_STRING(lp_preexec, szPreExec)
+FN_LOCAL_STRING(lp_postexec, szPostExec)
+FN_LOCAL_STRING(lp_rootpreexec, szRootPreExec)
+FN_LOCAL_STRING(lp_rootpostexec, szRootPostExec)
+FN_LOCAL_STRING(lp_servicename, szService)
+FN_LOCAL_STRING(lp_pathname, szPath)
+FN_LOCAL_STRING(lp_dontdescend, szDontdescend)
+FN_LOCAL_STRING(lp_username, szUsername)
+FN_LOCAL_STRING(lp_guestaccount, szGuestaccount)
+FN_LOCAL_STRING(lp_invalid_users, szInvalidUsers)
+FN_LOCAL_STRING(lp_valid_users, szValidUsers)
+FN_LOCAL_STRING(lp_admin_users, szAdminUsers)
+FN_LOCAL_STRING(lp_printcommand, szPrintcommand)
+FN_LOCAL_STRING(lp_lpqcommand, szLpqcommand)
+FN_LOCAL_STRING(lp_lprmcommand, szLprmcommand)
+FN_LOCAL_STRING(lp_lppausecommand, szLppausecommand)
+FN_LOCAL_STRING(lp_lpresumecommand, szLpresumecommand)
+FN_LOCAL_STRING(lp_queuepausecommand, szQueuepausecommand)
+FN_LOCAL_STRING(lp_queueresumecommand, szQueueresumecommand)
+FN_LOCAL_STRING(lp_printername, szPrintername)
+FN_LOCAL_STRING(lp_printerdriver, szPrinterDriver)
+FN_LOCAL_STRING(lp_hostsallow, szHostsallow)
+FN_LOCAL_STRING(lp_hostsdeny, szHostsdeny)
+FN_LOCAL_STRING(lp_magicscript, szMagicScript)
+FN_LOCAL_STRING(lp_magicoutput, szMagicOutput)
+FN_LOCAL_STRING(lp_comment, comment)
+FN_LOCAL_STRING(lp_force_user, force_user)
+FN_LOCAL_STRING(lp_force_group, force_group)
+FN_LOCAL_STRING(lp_readlist, readlist)
+FN_LOCAL_STRING(lp_writelist, writelist)
+FN_LOCAL_STRING(lp_fstype, fstype) FN_LOCAL_STRING(lp_vfsobj, szVfsObjectFile)
+     static FN_LOCAL_STRING(lp_volume, volume)
+	FN_LOCAL_STRING(lp_mangled_map, szMangledMap)
+	FN_LOCAL_STRING(lp_veto_files, szVetoFiles)
+FN_LOCAL_STRING(lp_hide_files, szHideFiles)
+FN_LOCAL_STRING(lp_veto_oplocks, szVetoOplockFiles)
+FN_LOCAL_STRING(lp_driverlocation, szPrinterDriverLocation)
 FN_LOCAL_BOOL(lp_msdfs_root, bMSDfsRoot)
-
-FN_LOCAL_BOOL(lp_autoloaded,autoloaded)
-FN_LOCAL_BOOL(lp_preexec_close,bPreexecClose)
-FN_LOCAL_BOOL(lp_rootpreexec_close,bRootpreexecClose)
-FN_LOCAL_BOOL(lp_casesensitive,bCaseSensitive)
-FN_LOCAL_BOOL(lp_preservecase,bCasePreserve)
-FN_LOCAL_BOOL(lp_shortpreservecase,bShortCasePreserve)
-FN_LOCAL_BOOL(lp_casemangle,bCaseMangle)
-FN_LOCAL_BOOL(lp_status,status)
-FN_LOCAL_BOOL(lp_hide_dot_files,bHideDotFiles)
-FN_LOCAL_BOOL(lp_browseable,bBrowseable)
-FN_LOCAL_BOOL(lp_readonly,bRead_only)
-FN_LOCAL_BOOL(lp_no_set_dir,bNo_set_dir)
-FN_LOCAL_BOOL(lp_guest_ok,bGuest_ok)
-FN_LOCAL_BOOL(lp_guest_only,bGuest_only)
-FN_LOCAL_BOOL(lp_print_ok,bPrint_ok)
-FN_LOCAL_BOOL(lp_postscript,bPostscript)
-FN_LOCAL_BOOL(lp_map_hidden,bMap_hidden)
-FN_LOCAL_BOOL(lp_map_archive,bMap_archive)
-FN_LOCAL_BOOL(lp_locking,bLocking)
-FN_LOCAL_BOOL(lp_strict_locking,bStrictLocking)
-FN_LOCAL_BOOL(lp_posix_locking,bPosixLocking)
+FN_LOCAL_BOOL(lp_autoloaded, autoloaded)
+FN_LOCAL_BOOL(lp_preexec_close, bPreexecClose)
+FN_LOCAL_BOOL(lp_rootpreexec_close, bRootpreexecClose)
+FN_LOCAL_BOOL(lp_casesensitive, bCaseSensitive)
+FN_LOCAL_BOOL(lp_preservecase, bCasePreserve)
+FN_LOCAL_BOOL(lp_shortpreservecase, bShortCasePreserve)
+FN_LOCAL_BOOL(lp_casemangle, bCaseMangle)
+FN_LOCAL_BOOL(lp_status, status)
+FN_LOCAL_BOOL(lp_hide_dot_files, bHideDotFiles)
+FN_LOCAL_BOOL(lp_browseable, bBrowseable)
+FN_LOCAL_BOOL(lp_readonly, bRead_only)
+FN_LOCAL_BOOL(lp_no_set_dir, bNo_set_dir)
+FN_LOCAL_BOOL(lp_guest_ok, bGuest_ok)
+FN_LOCAL_BOOL(lp_guest_only, bGuest_only)
+FN_LOCAL_BOOL(lp_print_ok, bPrint_ok)
+FN_LOCAL_BOOL(lp_postscript, bPostscript)
+FN_LOCAL_BOOL(lp_map_hidden, bMap_hidden)
+FN_LOCAL_BOOL(lp_map_archive, bMap_archive)
+FN_LOCAL_BOOL(lp_locking, bLocking)
+FN_LOCAL_BOOL(lp_strict_locking, bStrictLocking)
+FN_LOCAL_BOOL(lp_posix_locking, bPosixLocking)
 #ifdef WITH_UTMP
-FN_LOCAL_BOOL(lp_utmp,bUtmp)
+FN_LOCAL_BOOL(lp_utmp, bUtmp)
 #endif
-FN_LOCAL_BOOL(lp_share_modes,bShareModes)
-FN_LOCAL_BOOL(lp_oplocks,bOpLocks)
-FN_LOCAL_BOOL(lp_level2_oplocks,bLevel2OpLocks)
-FN_LOCAL_BOOL(lp_onlyuser,bOnlyUser)
-FN_LOCAL_BOOL(lp_manglednames,bMangledNames)
-FN_LOCAL_BOOL(lp_widelinks,bWidelinks)
-FN_LOCAL_BOOL(lp_symlinks,bSymlinks)
-FN_LOCAL_BOOL(lp_syncalways,bSyncAlways)
-FN_LOCAL_BOOL(lp_strict_sync,bStrictSync)
-FN_LOCAL_BOOL(lp_map_system,bMap_system)
-FN_LOCAL_BOOL(lp_delete_readonly,bDeleteReadonly)
-FN_LOCAL_BOOL(lp_fake_oplocks,bFakeOplocks)
-FN_LOCAL_BOOL(lp_recursive_veto_delete,bDeleteVetoFiles)
-FN_LOCAL_BOOL(lp_dos_filetimes,bDosFiletimes)
-FN_LOCAL_BOOL(lp_dos_filetime_resolution,bDosFiletimeResolution)
-FN_LOCAL_BOOL(lp_fake_dir_create_times,bFakeDirCreateTimes)
-FN_LOCAL_BOOL(lp_blocking_locks,bBlockingLocks)
-FN_LOCAL_BOOL(lp_inherit_perms,bInheritPerms)
-
-FN_LOCAL_INTEGER(lp_create_mask,iCreate_mask)
-FN_LOCAL_INTEGER(lp_force_create_mode,iCreate_force_mode)
-FN_LOCAL_INTEGER(_lp_security_mask,iSecurity_mask)
-FN_LOCAL_INTEGER(_lp_force_security_mode,iSecurity_force_mode)
-FN_LOCAL_INTEGER(lp_dir_mask,iDir_mask)
-FN_LOCAL_INTEGER(lp_force_dir_mode,iDir_force_mode)
-FN_LOCAL_INTEGER(_lp_dir_security_mask,iDir_Security_mask)
-FN_LOCAL_INTEGER(_lp_force_dir_security_mode,iDir_Security_force_mode)
-FN_LOCAL_INTEGER(lp_max_connections,iMaxConnections)
-FN_LOCAL_INTEGER(lp_defaultcase,iDefaultCase)
-FN_LOCAL_INTEGER(lp_minprintspace,iMinPrintSpace)
-FN_LOCAL_INTEGER(lp_printing,iPrinting)
-FN_LOCAL_INTEGER(lp_oplock_contention_limit,iOplockContentionLimit)
-FN_LOCAL_INTEGER(lp_write_cache_size,iWriteCacheSize)
-
-FN_LOCAL_CHAR(lp_magicchar,magic_char)
-
-
+FN_LOCAL_BOOL(lp_share_modes, bShareModes)
+FN_LOCAL_BOOL(lp_oplocks, bOpLocks)
+FN_LOCAL_BOOL(lp_level2_oplocks, bLevel2OpLocks)
+FN_LOCAL_BOOL(lp_onlyuser, bOnlyUser)
+FN_LOCAL_BOOL(lp_manglednames, bMangledNames)
+FN_LOCAL_BOOL(lp_widelinks, bWidelinks)
+FN_LOCAL_BOOL(lp_symlinks, bSymlinks)
+FN_LOCAL_BOOL(lp_syncalways, bSyncAlways)
+FN_LOCAL_BOOL(lp_strict_sync, bStrictSync)
+FN_LOCAL_BOOL(lp_map_system, bMap_system)
+FN_LOCAL_BOOL(lp_delete_readonly, bDeleteReadonly)
+FN_LOCAL_BOOL(lp_fake_oplocks, bFakeOplocks)
+FN_LOCAL_BOOL(lp_recursive_veto_delete, bDeleteVetoFiles)
+FN_LOCAL_BOOL(lp_dos_filetimes, bDosFiletimes)
+FN_LOCAL_BOOL(lp_dos_filetime_resolution, bDosFiletimeResolution)
+FN_LOCAL_BOOL(lp_fake_dir_create_times, bFakeDirCreateTimes)
+FN_LOCAL_BOOL(lp_blocking_locks, bBlockingLocks)
+FN_LOCAL_BOOL(lp_inherit_perms, bInheritPerms)
+FN_LOCAL_INTEGER(lp_create_mask, iCreate_mask)
+FN_LOCAL_INTEGER(lp_force_create_mode, iCreate_force_mode)
+FN_LOCAL_INTEGER(_lp_security_mask, iSecurity_mask)
+FN_LOCAL_INTEGER(_lp_force_security_mode, iSecurity_force_mode)
+FN_LOCAL_INTEGER(lp_dir_mask, iDir_mask)
+FN_LOCAL_INTEGER(lp_force_dir_mode, iDir_force_mode)
+FN_LOCAL_INTEGER(_lp_dir_security_mask, iDir_Security_mask)
+FN_LOCAL_INTEGER(_lp_force_dir_security_mode, iDir_Security_force_mode)
+FN_LOCAL_INTEGER(lp_max_connections, iMaxConnections)
+FN_LOCAL_INTEGER(lp_defaultcase, iDefaultCase)
+FN_LOCAL_INTEGER(lp_minprintspace, iMinPrintSpace)
+FN_LOCAL_INTEGER(lp_printing, iPrinting)
+FN_LOCAL_INTEGER(lp_oplock_contention_limit, iOplockContentionLimit)
+FN_LOCAL_INTEGER(lp_write_cache_size, iWriteCacheSize)
+FN_LOCAL_CHAR(lp_magicchar, magic_char)
 FN_GLOBAL_INTEGER(lp_winbind_cache_time, &Globals.winbind_cache_time)
-
 /* local prototypes */
-static int    strwicmp( char *psz1, char *psz2 );
-static int    map_parameter( char *pszParmName);
-static BOOL   set_boolean( BOOL *pb, char *pszParmValue );
-static int    getservicebyname(char *pszServiceName, service *pserviceDest);
-static void   copy_service( service *pserviceDest, 
-                            service *pserviceSource,
-                            BOOL *pcopymapDest );
-static BOOL   service_ok(int iService);
-static BOOL   do_parameter(char *pszParmName, char *pszParmValue);
-static BOOL   do_section(char *pszSectionName);
-static void init_copymap(service *pservice);
+     static int strwicmp(char *psz1, char *psz2);
+     static int map_parameter(char *pszParmName);
+     static BOOL set_boolean(BOOL *pb, char *pszParmValue);
+     static int getservicebyname(char *pszServiceName,
+				 service * pserviceDest);
+     static void copy_service(service * pserviceDest,
+			      service * pserviceSource, BOOL *pcopymapDest);
+     static BOOL service_ok(int iService);
+     static BOOL do_parameter(char *pszParmName, char *pszParmValue);
+     static BOOL do_section(char *pszSectionName);
+     static void init_copymap(service * pservice);
 
 
 /***************************************************************************
 initialise a service to the defaults
 ***************************************************************************/
-static void init_service(service *pservice)
+     static void init_service(service * pservice)
 {
-  memset((char *)pservice,'\0',sizeof(service));
-  copy_service(pservice,&sDefault,NULL);
+	memset((char *)pservice, '\0', sizeof(service));
+	copy_service(pservice, &sDefault, NULL);
 }
 
 
 /***************************************************************************
 free the dynamically allocated parts of a service struct
 ***************************************************************************/
-static void free_service(service *pservice)
+static void free_service(service * pservice)
 {
-  int i;
-  if (!pservice)
-     return;
-
-  if(pservice->szService)
-    DEBUG(5,("free_service: Freeing service %s\n", pservice->szService));
+	int i;
+	if (!pservice)
+		return;
+
+	if (pservice->szService)
+		DEBUG(5,
+		      ("free_service: Freeing service %s\n",
+		       pservice->szService));
+
+	string_free(&pservice->szService);
+	if (pservice->copymap)
+	{
+		free(pservice->copymap);
+		pservice->copymap = NULL;
+	}
 
-  string_free(&pservice->szService);
-  if (pservice->copymap)
-  {
-    free(pservice->copymap);
-    pservice->copymap = NULL;
-  }
- 
-  for (i=0;parm_table[i].label;i++)
-    if ((parm_table[i].type == P_STRING ||
-	 parm_table[i].type == P_USTRING) &&
-	parm_table[i].class == P_LOCAL)
-      string_free((char **)(((char *)pservice) + PTR_DIFF(parm_table[i].ptr,&sDefault)));
+	for (i = 0; parm_table[i].label; i++)
+		if ((parm_table[i].type == P_STRING ||
+		     parm_table[i].type == P_USTRING) &&
+		    parm_table[i].class == P_LOCAL)
+			string_free((char **)
+				    (((char *)pservice) +
+				     PTR_DIFF(parm_table[i].ptr, &sDefault)));
 }
 
 /***************************************************************************
 add a new service to the services array initialising it with the given 
 service
 ***************************************************************************/
-static int add_a_service(service *pservice, char *name)
+static int add_a_service(service * pservice, char *name)
 {
-  int i;
-  service tservice;
-  int num_to_alloc = iNumServices+1;
-
-  tservice = *pservice;
-
-  /* it might already exist */
-  if (name) 
-    {
-      i = getservicebyname(name,NULL);
-      if (i >= 0)
-	return(i);
-    }
+	int i;
+	service tservice;
+	int num_to_alloc = iNumServices + 1;
 
-  /* find an invalid one */
-  for (i=0;i<iNumServices;i++)
-    if (!pSERVICE(i)->valid)
-      break;
+	tservice = *pservice;
 
-  /* if not, then create one */
-  if (i == iNumServices)
-    {
-      ServicePtrs = (service **)Realloc(ServicePtrs,sizeof(service *)*num_to_alloc);
-      if (ServicePtrs)
-	pSERVICE(iNumServices) = (service *)malloc(sizeof(service));
+	/* it might already exist */
+	if (name)
+	{
+		i = getservicebyname(name, NULL);
+		if (i >= 0)
+			return (i);
+	}
 
-      if (!ServicePtrs || !pSERVICE(iNumServices))
-	return(-1);
+	/* find an invalid one */
+	for (i = 0; i < iNumServices; i++)
+		if (!pSERVICE(i)->valid)
+			break;
 
-      iNumServices++;
-    }
-  else
-    free_service(pSERVICE(i));
+	/* if not, then create one */
+	if (i == iNumServices)
+	{
+		ServicePtrs =
+			(service **) Realloc(ServicePtrs,
+					     sizeof(service *) *
+					     num_to_alloc);
+		if (ServicePtrs)
+			pSERVICE(iNumServices) =
+				(service *) malloc(sizeof(service));
+
+		if (!ServicePtrs || !pSERVICE(iNumServices))
+			return (-1);
+
+		iNumServices++;
+	}
+	else
+		free_service(pSERVICE(i));
 
-  pSERVICE(i)->valid = True;
+	pSERVICE(i)->valid = True;
 
-  init_service(pSERVICE(i));
-  copy_service(pSERVICE(i),&tservice,NULL);
-  if (name) {
-    string_set(&iSERVICE(i).szService,name);  
-    unix_to_dos(iSERVICE(i).szService, True);
-  }
-  return(i);
+	init_service(pSERVICE(i));
+	copy_service(pSERVICE(i), &tservice, NULL);
+	if (name)
+	{
+		string_set(&iSERVICE(i).szService, name);
+		unix_to_dos(iSERVICE(i).szService, True);
+	}
+	return (i);
 }
 
 /***************************************************************************
@@ -1585,26 +1915,28 @@ from service ifrom
 ***************************************************************************/
 BOOL lp_add_home(char *pszHomename, int iDefaultService, char *pszHomedir)
 {
-  int i = add_a_service(pSERVICE(iDefaultService),pszHomename);
+	int i = add_a_service(pSERVICE(iDefaultService), pszHomename);
 
-  if (i < 0)
-    return(False);
+	if (i < 0)
+		return (False);
 
-  if (!(*(iSERVICE(i).szPath)) || strequal(iSERVICE(i).szPath,lp_pathname(-1)))
-    string_set(&iSERVICE(i).szPath,pszHomedir);
-  if (!(*(iSERVICE(i).comment)))
-    {
-      pstring comment;
-      slprintf(comment,sizeof(comment)-1,
-	       "Home directory of %s",pszHomename);
-      string_set(&iSERVICE(i).comment,comment);
-    }
-  iSERVICE(i).bAvailable = sDefault.bAvailable;
-  iSERVICE(i).bBrowseable = sDefault.bBrowseable;
+	if (!(*(iSERVICE(i).szPath))
+	    || strequal(iSERVICE(i).szPath, lp_pathname(-1)))
+		string_set(&iSERVICE(i).szPath, pszHomedir);
+	if (!(*(iSERVICE(i).comment)))
+	{
+		pstring comment;
+		slprintf(comment, sizeof(comment) - 1,
+			 "Home directory of %s", pszHomename);
+		string_set(&iSERVICE(i).comment, comment);
+	}
+	iSERVICE(i).bAvailable = sDefault.bAvailable;
+	iSERVICE(i).bBrowseable = sDefault.bBrowseable;
 
-  DEBUG(3,("adding home directory %s at %s\n", pszHomename, pszHomedir));
+	DEBUG(3,
+	      ("adding home directory %s at %s\n", pszHomename, pszHomedir));
 
-  return(True);
+	return (True);
 }
 
 /***************************************************************************
@@ -1612,7 +1944,7 @@ add a new service, based on an old one
 ***************************************************************************/
 int lp_add_service(char *pszService, int iDefaultService)
 {
-  return(add_a_service(pSERVICE(iDefaultService),pszService));
+	return (add_a_service(pSERVICE(iDefaultService), pszService));
 }
 
 
@@ -1621,31 +1953,31 @@ add the IPC service
 ***************************************************************************/
 static BOOL lp_add_ipc(void)
 {
-  pstring comment;
-  int i = add_a_service(&sDefault,"IPC$");
+	pstring comment;
+	int i = add_a_service(&sDefault, "IPC$");
 
-  if (i < 0)
-    return(False);
+	if (i < 0)
+		return (False);
 
-  slprintf(comment,sizeof(comment)-1,
-	   "IPC Service (%s)", Globals.szServerString );
+	slprintf(comment, sizeof(comment) - 1,
+		 "IPC Service (%s)", Globals.szServerString);
 
-  string_set(&iSERVICE(i).szPath,tmpdir());
-  string_set(&iSERVICE(i).szUsername,"");
-  string_set(&iSERVICE(i).comment,comment);
-  string_set(&iSERVICE(i).fstype,"IPC");
-  iSERVICE(i).status = False;
-  iSERVICE(i).iMaxConnections = 0;
-  iSERVICE(i).bAvailable = True;
-  iSERVICE(i).bRead_only = True;
-  iSERVICE(i).bGuest_only = False;
-  iSERVICE(i).bGuest_ok = True;
-  iSERVICE(i).bPrint_ok = False;
-  iSERVICE(i).bBrowseable = sDefault.bBrowseable;
+	string_set(&iSERVICE(i).szPath, tmpdir());
+	string_set(&iSERVICE(i).szUsername, "");
+	string_set(&iSERVICE(i).comment, comment);
+	string_set(&iSERVICE(i).fstype, "IPC");
+	iSERVICE(i).status = False;
+	iSERVICE(i).iMaxConnections = 0;
+	iSERVICE(i).bAvailable = True;
+	iSERVICE(i).bRead_only = True;
+	iSERVICE(i).bGuest_only = False;
+	iSERVICE(i).bGuest_ok = True;
+	iSERVICE(i).bPrint_ok = False;
+	iSERVICE(i).bBrowseable = sDefault.bBrowseable;
 
-  DEBUG(3,("adding IPC service\n"));
+	DEBUG(3, ("adding IPC service\n"));
 
-  return(True);
+	return (True);
 }
 
 
@@ -1654,33 +1986,33 @@ add a new printer service, with defaults coming from service iFrom
 ***************************************************************************/
 BOOL lp_add_printer(char *pszPrintername, int iDefaultService)
 {
-  char *comment = "From Printcap";
-  int i = add_a_service(pSERVICE(iDefaultService),pszPrintername);
-  
-  if (i < 0)
-    return(False);
-  
-  /* note that we do NOT default the availability flag to True - */
-  /* we take it from the default service passed. This allows all */
-  /* dynamic printers to be disabled by disabling the [printers] */
-  /* entry (if/when the 'available' keyword is implemented!).    */
-  
-  /* the printer name is set to the service name. */
-  string_set(&iSERVICE(i).szPrintername,pszPrintername);
-  string_set(&iSERVICE(i).comment,comment);
-  iSERVICE(i).bBrowseable = sDefault.bBrowseable;
-  /* Printers cannot be read_only. */
-  iSERVICE(i).bRead_only = False;
-  /* No share modes on printer services. */
-  iSERVICE(i).bShareModes = False;
-  /* No oplocks on printer services. */
-  iSERVICE(i).bOpLocks = False;
-  /* Printer services must be printable. */
-  iSERVICE(i).bPrint_ok = True;
-  
-  DEBUG(3,("adding printer service %s\n",pszPrintername));
-  
-  return(True);
+	char *comment = "From Printcap";
+	int i = add_a_service(pSERVICE(iDefaultService), pszPrintername);
+
+	if (i < 0)
+		return (False);
+
+	/* note that we do NOT default the availability flag to True - */
+	/* we take it from the default service passed. This allows all */
+	/* dynamic printers to be disabled by disabling the [printers] */
+	/* entry (if/when the 'available' keyword is implemented!).    */
+
+	/* the printer name is set to the service name. */
+	string_set(&iSERVICE(i).szPrintername, pszPrintername);
+	string_set(&iSERVICE(i).comment, comment);
+	iSERVICE(i).bBrowseable = sDefault.bBrowseable;
+	/* Printers cannot be read_only. */
+	iSERVICE(i).bRead_only = False;
+	/* No share modes on printer services. */
+	iSERVICE(i).bShareModes = False;
+	/* No oplocks on printer services. */
+	iSERVICE(i).bOpLocks = False;
+	/* Printer services must be printable. */
+	iSERVICE(i).bPrint_ok = True;
+
+	DEBUG(3, ("adding printer service %s\n", pszPrintername));
+
+	return (True);
 }
 
 
@@ -1689,30 +2021,29 @@ Do a case-insensitive, whitespace-ignoring string compare.
 ***************************************************************************/
 static int strwicmp(char *psz1, char *psz2)
 {
-   /* if BOTH strings are NULL, return TRUE, if ONE is NULL return */
-   /* appropriate value. */
-   if (psz1 == psz2)
-      return (0);
-   else
-      if (psz1 == NULL)
-         return (-1);
-      else
-          if (psz2 == NULL)
-              return (1);
-
-   /* sync the strings on first non-whitespace */
-   while (1)
-   {
-      while (isspace(*psz1))
-         psz1++;
-      while (isspace(*psz2))
-         psz2++;
-      if (toupper(*psz1) != toupper(*psz2) || *psz1 == '\0' || *psz2 == '\0')
-         break;
-      psz1++;
-      psz2++;
-   }
-   return (*psz1 - *psz2);
+	/* if BOTH strings are NULL, return TRUE, if ONE is NULL return */
+	/* appropriate value. */
+	if (psz1 == psz2)
+		return (0);
+	else if (psz1 == NULL)
+		return (-1);
+	else if (psz2 == NULL)
+		return (1);
+
+	/* sync the strings on first non-whitespace */
+	while (1)
+	{
+		while (isspace(*psz1))
+			psz1++;
+		while (isspace(*psz2))
+			psz2++;
+		if (toupper(*psz1) != toupper(*psz2) || *psz1 == '\0'
+		    || *psz2 == '\0')
+			break;
+		psz1++;
+		psz2++;
+	}
+	return (*psz1 - *psz2);
 }
 
 /***************************************************************************
@@ -1721,17 +2052,17 @@ Returns False if the parameter string is not recognised, else TRUE.
 ***************************************************************************/
 static int map_parameter(char *pszParmName)
 {
-   int iIndex;
+	int iIndex;
 
-   if (*pszParmName == '-')
-     return(-1);
+	if (*pszParmName == '-')
+		return (-1);
 
-   for (iIndex = 0; parm_table[iIndex].label; iIndex++) 
-      if (strwicmp(parm_table[iIndex].label, pszParmName) == 0)
-         return(iIndex);
+	for (iIndex = 0; parm_table[iIndex].label; iIndex++)
+		if (strwicmp(parm_table[iIndex].label, pszParmName) == 0)
+			return (iIndex);
 
-   DEBUG(0,( "Unknown parameter encountered: \"%s\"\n", pszParmName));
-   return(-1);
+	DEBUG(0, ("Unknown parameter encountered: \"%s\"\n", pszParmName));
+	return (-1);
 }
 
 
@@ -1742,44 +2073,47 @@ represent a boolean.
 ***************************************************************************/
 static BOOL set_boolean(BOOL *pb, char *pszParmValue)
 {
-   BOOL bRetval;
-
-   bRetval = True;
-   if (strwicmp(pszParmValue, "yes") == 0 ||
-       strwicmp(pszParmValue, "true") == 0 ||
-       strwicmp(pszParmValue, "1") == 0)
-      *pb = True;
-   else
-      if (strwicmp(pszParmValue, "no") == 0 ||
-          strwicmp(pszParmValue, "False") == 0 ||
-          strwicmp(pszParmValue, "0") == 0)
-         *pb = False;
-      else
-      {
-         DEBUG(0,("ERROR: Badly formed boolean in configuration file: \"%s\".\n",
-               pszParmValue));
-         bRetval = False;
-      }
-   return (bRetval);
+	BOOL bRetval;
+
+	bRetval = True;
+	if (strwicmp(pszParmValue, "yes") == 0 ||
+	    strwicmp(pszParmValue, "true") == 0 ||
+	    strwicmp(pszParmValue, "1") == 0)
+		*pb = True;
+	else
+		if (strwicmp(pszParmValue, "no") == 0 ||
+		    strwicmp(pszParmValue, "False") == 0 ||
+		    strwicmp(pszParmValue, "0") == 0)
+		*pb = False;
+	else
+	{
+		DEBUG(0,
+		      ("ERROR: Badly formed boolean in configuration file: \"%s\".\n",
+		       pszParmValue));
+		bRetval = False;
+	}
+	return (bRetval);
 }
 
 /***************************************************************************
 Find a service by name. Otherwise works like get_service.
 ***************************************************************************/
-static int getservicebyname(char *pszServiceName, service *pserviceDest)
-{
-   int iService;
-
-   for (iService = iNumServices - 1; iService >= 0; iService--)
-      if (VALID(iService) &&
-	  strwicmp(iSERVICE(iService).szService, pszServiceName) == 0) 
-      {
-         if (pserviceDest != NULL)
-	   copy_service(pserviceDest, pSERVICE(iService), NULL);
-         break;
-      }
+static int getservicebyname(char *pszServiceName, service * pserviceDest)
+{
+	int iService;
+
+	for (iService = iNumServices - 1; iService >= 0; iService--)
+		if (VALID(iService) &&
+		    strwicmp(iSERVICE(iService).szService,
+			     pszServiceName) == 0)
+		{
+			if (pserviceDest != NULL)
+				copy_service(pserviceDest, pSERVICE(iService),
+					     NULL);
+			break;
+		}
 
-   return (iService);
+	return (iService);
 }
 
 
@@ -1789,60 +2123,64 @@ Copy a service structure to another
 
 If pcopymapDest is NULL then copy all fields
 ***************************************************************************/
-static void copy_service(service *pserviceDest, 
-                         service *pserviceSource,
-                         BOOL *pcopymapDest)
-{
-  int i;
-  BOOL bcopyall = (pcopymapDest == NULL);
-
-  for (i=0;parm_table[i].label;i++)
-    if (parm_table[i].ptr && parm_table[i].class == P_LOCAL && 
-	(bcopyall || pcopymapDest[i]))
-      {
-	void *def_ptr = parm_table[i].ptr;
-	void *src_ptr = 
-	  ((char *)pserviceSource) + PTR_DIFF(def_ptr,&sDefault);
-	void *dest_ptr = 
-	  ((char *)pserviceDest) + PTR_DIFF(def_ptr,&sDefault);
+static void copy_service(service * pserviceDest,
+			 service * pserviceSource, BOOL *pcopymapDest)
+{
+	int i;
+	BOOL bcopyall = (pcopymapDest == NULL);
+
+	for (i = 0; parm_table[i].label; i++)
+		if (parm_table[i].ptr && parm_table[i].class == P_LOCAL &&
+		    (bcopyall || pcopymapDest[i]))
+		{
+			void *def_ptr = parm_table[i].ptr;
+			void *src_ptr =
+				((char *)pserviceSource) + PTR_DIFF(def_ptr,
+								    &sDefault);
+			void *dest_ptr =
+				((char *)pserviceDest) + PTR_DIFF(def_ptr,
+								  &sDefault);
+
+			switch (parm_table[i].type)
+			{
+				case P_BOOL:
+				case P_BOOLREV:
+					*(BOOL *)dest_ptr = *(BOOL *)src_ptr;
+					break;
+
+				case P_INTEGER:
+				case P_ENUM:
+				case P_OCTAL:
+					*(int *)dest_ptr = *(int *)src_ptr;
+					break;
+
+				case P_CHAR:
+					*(char *)dest_ptr = *(char *)src_ptr;
+					break;
+
+				case P_STRING:
+					string_set(dest_ptr,
+						   *(char **)src_ptr);
+					break;
+
+				case P_USTRING:
+					string_set(dest_ptr,
+						   *(char **)src_ptr);
+					strupper(*(char **)dest_ptr);
+					break;
+				default:
+					break;
+			}
+		}
 
-	switch (parm_table[i].type)
-	  {
-	  case P_BOOL:
-	  case P_BOOLREV:
-	    *(BOOL *)dest_ptr = *(BOOL *)src_ptr;
-	    break;
-
-	  case P_INTEGER:
-	  case P_ENUM:
-	  case P_OCTAL:
-	    *(int *)dest_ptr = *(int *)src_ptr;
-	    break;
-
-	  case P_CHAR:
-	    *(char *)dest_ptr = *(char *)src_ptr;
-	    break;
-
-	  case P_STRING:
-	    string_set(dest_ptr,*(char **)src_ptr);
-	    break;
-
-	  case P_USTRING:
-	    string_set(dest_ptr,*(char **)src_ptr);
-	    strupper(*(char **)dest_ptr);
-	    break;
-	  default:
-	    break;
-	  }
-      }
-
-  if (bcopyall)
-    {
-      init_copymap(pserviceDest);
-      if (pserviceSource->copymap)
-	memcpy((void *)pserviceDest->copymap,
-	       (void *)pserviceSource->copymap,sizeof(BOOL)*NUMPARAMETERS);
-    }
+	if (bcopyall)
+	{
+		init_copymap(pserviceDest);
+		if (pserviceSource->copymap)
+			memcpy((void *)pserviceDest->copymap,
+			       (void *)pserviceSource->copymap,
+			       sizeof(BOOL) * NUMPARAMETERS);
+	}
 }
 
 /***************************************************************************
@@ -1851,46 +2189,52 @@ incomplete or faulty, else True.
 ***************************************************************************/
 static BOOL service_ok(int iService)
 {
-   BOOL bRetval;
-
-   bRetval = True;
-   if (iSERVICE(iService).szService[0] == '\0')
-   {
-      DEBUG(0,( "The following message indicates an internal error:\n"));
-      DEBUG(0,( "No service name in service entry.\n"));
-      bRetval = False;
-   }
-
-   /* The [printers] entry MUST be printable. I'm all for flexibility, but */
-   /* I can't see why you'd want a non-printable printer service...        */
-   if (strwicmp(iSERVICE(iService).szService,PRINTERS_NAME) == 0)
-      if (!iSERVICE(iService).bPrint_ok)
-      {
-         DEBUG(0,( "WARNING: [%s] service MUST be printable!\n",
-               iSERVICE(iService).szService));
-	 iSERVICE(iService).bPrint_ok = True;
-      }
-
-   if (iSERVICE(iService).szPath[0] == '\0' &&
-       strwicmp(iSERVICE(iService).szService,HOMES_NAME) != 0)
-   {
-      DEBUG(0,("No path in service %s - using %s\n",iSERVICE(iService).szService,tmpdir()));
-      string_set(&iSERVICE(iService).szPath,tmpdir());      
-   }
-
-   /* If a service is flagged unavailable, log the fact at level 0. */
-   if (!iSERVICE(iService).bAvailable) 
-      DEBUG(1,( "NOTE: Service %s is flagged unavailable.\n",
-            iSERVICE(iService).szService));
-
-   return (bRetval);
-}
-
-static struct file_lists {
-  struct file_lists *next;
-  char *name;
-  time_t modtime;
-} *file_lists = NULL;
+	BOOL bRetval;
+
+	bRetval = True;
+	if (iSERVICE(iService).szService[0] == '\0')
+	{
+		DEBUG(0,
+		      ("The following message indicates an internal error:\n"));
+		DEBUG(0, ("No service name in service entry.\n"));
+		bRetval = False;
+	}
+
+	/* The [printers] entry MUST be printable. I'm all for flexibility, but */
+	/* I can't see why you'd want a non-printable printer service...        */
+	if (strwicmp(iSERVICE(iService).szService, PRINTERS_NAME) == 0)
+		if (!iSERVICE(iService).bPrint_ok)
+		{
+			DEBUG(0,
+			      ("WARNING: [%s] service MUST be printable!\n",
+			       iSERVICE(iService).szService));
+			iSERVICE(iService).bPrint_ok = True;
+		}
+
+	if (iSERVICE(iService).szPath[0] == '\0' &&
+	    strwicmp(iSERVICE(iService).szService, HOMES_NAME) != 0)
+	{
+		DEBUG(0,
+		      ("No path in service %s - using %s\n",
+		       iSERVICE(iService).szService, tmpdir()));
+		string_set(&iSERVICE(iService).szPath, tmpdir());
+	}
+
+	/* If a service is flagged unavailable, log the fact at level 0. */
+	if (!iSERVICE(iService).bAvailable)
+		DEBUG(1, ("NOTE: Service %s is flagged unavailable.\n",
+			  iSERVICE(iService).szService));
+
+	return (bRetval);
+}
+
+static struct file_lists
+{
+	struct file_lists *next;
+	char *name;
+	time_t modtime;
+}
+ *file_lists = NULL;
 
 /*******************************************************************
 keep a linked list of all config files so we know when one has changed 
@@ -1898,31 +2242,36 @@ it's date and needs to be reloaded
 ********************************************************************/
 static void add_to_file_list(char *fname)
 {
-  struct file_lists *f=file_lists;
+	struct file_lists *f = file_lists;
 
-  while (f) {
-    if (f->name && !strcmp(f->name,fname)) break;
-    f = f->next;
-  }
+	while (f)
+	{
+		if (f->name && !strcmp(f->name, fname))
+			break;
+		f = f->next;
+	}
 
-  if (!f) {
-    f = (struct file_lists *)malloc(sizeof(file_lists[0]));
-    if (!f) return;
-    f->next = file_lists;
-    f->name = strdup(fname);
-    if (!f->name) {
-      free(f);
-      return;
-    }
-    file_lists = f;
-  }
+	if (!f)
+	{
+		f = (struct file_lists *)malloc(sizeof(file_lists[0]));
+		if (!f)
+			return;
+		f->next = file_lists;
+		f->name = strdup(fname);
+		if (!f->name)
+		{
+			free(f);
+			return;
+		}
+		file_lists = f;
+	}
 
-  {
-    pstring n2;
-    pstrcpy(n2,fname);
-    standard_sub_basic(n2);
-    f->modtime = file_modtime(n2);
-  }
+	{
+		pstring n2;
+		pstrcpy(n2, fname);
+		standard_sub_basic(n2);
+		f->modtime = file_modtime(n2);
+	}
 
 }
 
@@ -1931,30 +2280,33 @@ check if a config file has changed date
 ********************************************************************/
 BOOL lp_file_list_changed(void)
 {
-  struct file_lists *f = file_lists;
-  DEBUG(6,("lp_file_list_changed()\n"));
+	struct file_lists *f = file_lists;
+	DEBUG(6, ("lp_file_list_changed()\n"));
 
-  while (f)
-  {
-    pstring n2;
-    time_t mod_time;
+	while (f)
+	{
+		pstring n2;
+		time_t mod_time;
 
-    pstrcpy(n2,f->name);
-    standard_sub_basic(n2);
+		pstrcpy(n2, f->name);
+		standard_sub_basic(n2);
 
-    DEBUGADD( 6, ( "file %s -> %s  last mod_time: %s\n",
-                   f->name, n2, ctime(&f->modtime) ) );
+		DEBUGADD(6, ("file %s -> %s  last mod_time: %s\n",
+			     f->name, n2, ctime(&f->modtime)));
 
-    mod_time = file_modtime(n2);
+		mod_time = file_modtime(n2);
 
-    if (f->modtime != mod_time) {
-	    DEBUGADD(6,("file %s modified: %s\n", n2, ctime(&mod_time)));
-	    f->modtime = mod_time;
-	    return(True);
-    }
-    f = f->next;
-  }
-  return(False);
+		if (f->modtime != mod_time)
+		{
+			DEBUGADD(6,
+				 ("file %s modified: %s\n", n2,
+				  ctime(&mod_time)));
+			f->modtime = mod_time;
+			return (True);
+		}
+		f = f->next;
+	}
+	return (False);
 }
 
 /***************************************************************************
@@ -1963,11 +2315,11 @@ BOOL lp_file_list_changed(void)
  Note: We must *NOT* use string_set() here as ptr points to global_myname.
 ***************************************************************************/
 
-static BOOL handle_netbios_name(char *pszParmValue,char **ptr)
+static BOOL handle_netbios_name(char *pszParmValue, char **ptr)
 {
 	pstring netbios_name;
 
-	pstrcpy(netbios_name,pszParmValue);
+	pstrcpy(netbios_name, pszParmValue);
 
 	standard_sub_basic(netbios_name);
 	strupper(netbios_name);
@@ -1977,11 +2329,13 @@ static BOOL handle_netbios_name(char *pszParmValue,char **ptr)
 	 * isn't called on the special handlers.
 	 */
 	unix_to_dos(netbios_name, True);
-	pstrcpy(global_myname,netbios_name);
+	pstrcpy(global_myname, netbios_name);
 
-	DEBUG(4,("handle_netbios_name: set global_myname to: %s\n", global_myname));
+	DEBUG(4,
+	      ("handle_netbios_name: set global_myname to: %s\n",
+	       global_myname));
 
-	return(True);
+	return (True);
 }
 
 /***************************************************************************
@@ -1995,60 +2349,68 @@ static BOOL source_env(char **lines)
 	int i;
 	char *p;
 
-	for (i=0; lines[i]; i++) {
+	for (i = 0; lines[i]; i++)
+	{
 		char *line = lines[i];
 
-		if((len = strlen(line)) == 0)
+		if ((len = strlen(line)) == 0)
 			continue;
 
 		if (line[len - 1] == '\n')
 			line[--len] = '\0';
 
-		if ((varval=malloc(len+1)) == NULL) {
-			DEBUG(0,("source_env: Not enough memory!\n"));
-			return(False);
+		if ((varval = malloc(len + 1)) == NULL)
+		{
+			DEBUG(0, ("source_env: Not enough memory!\n"));
+			return (False);
 		}
 
-		DEBUG(4,("source_env: Adding to environment: %s\n", line));
+		DEBUG(4, ("source_env: Adding to environment: %s\n", line));
 		strncpy(varval, line, len);
 		varval[len] = '\0';
 
-		p=strchr(line, (int) '=');
-		if (p == NULL) {
-			DEBUG(4,("source_env: missing '=': %s\n", line));
+		p = strchr(line, (int)'=');
+		if (p == NULL)
+		{
+			DEBUG(4, ("source_env: missing '=': %s\n", line));
 			continue;
 		}
 
-		if (putenv(varval)) {
-			DEBUG(0,("source_env: Failed to put environment variable %s\n", varval ));
+		if (putenv(varval))
+		{
+			DEBUG(0,
+			      ("source_env: Failed to put environment variable %s\n",
+			       varval));
 			continue;
 		}
 
-		*p='\0';
+		*p = '\0';
 		p++;
-		DEBUG(4,("source_env: getting var %s = %s\n", line, getenv(line)));
+		DEBUG(4,
+		      ("source_env: getting var %s = %s\n", line,
+		       getenv(line)));
 	}
 
-	DEBUG(4,("source_env: returning successfully\n"));
-	return(True);
+	DEBUG(4, ("source_env: returning successfully\n"));
+	return (True);
 }
 
 /***************************************************************************
  Handle the source environment operation
 ***************************************************************************/
 
-static BOOL handle_source_env(char *pszParmValue,char **ptr)
+static BOOL handle_source_env(char *pszParmValue, char **ptr)
 {
 	pstring fname;
 	char *p = fname;
 	BOOL result;
 	char **lines;
 
-	pstrcpy(fname,pszParmValue);
+	pstrcpy(fname, pszParmValue);
 
 	standard_sub_basic(fname);
 
-	string_set(ptr,pszParmValue);
+	string_set(ptr, pszParmValue);
 
 	DEBUG(4, ("handle_source_env: checking env type\n"));
 
@@ -2056,46 +2418,52 @@ static BOOL handle_source_env(char *pszParmValue,char **ptr)
 	 * Filename starting with '|' means popen and read from stdin.
 	 */
 
-	if (*p == '|') {
-		lines = file_lines_pload(p+1, NULL);
-	} else {
+	if (*p == '|')
+	{
+		lines = file_lines_pload(p + 1, NULL);
+	}
+	else
+	{
 		lines = file_lines_load(fname, NULL);
 	}
 
-	if (!lines) {
-		DEBUG(0,("handle_source_env: Failed to open file %s, Error was %s\n", fname, strerror(errno) ));
-		return(False);
+	if (!lines)
+	{
+		DEBUG(0,
+		      ("handle_source_env: Failed to open file %s, Error was %s\n",
+		       fname, strerror(errno)));
+		return (False);
 	}
 
-	result=source_env(lines);
+	result = source_env(lines);
 	file_lines_free(lines);
 
-	return(result);
+	return (result);
 }
 
 /***************************************************************************
   handle the interpretation of the vfs object parameter
   *************************************************************************/
-static BOOL handle_vfs_object(char *pszParmValue,char **ptr)
+static BOOL handle_vfs_object(char *pszParmValue, char **ptr)
 {
-    /* Set string value */
+	/* Set string value */
 
-    string_set(ptr,pszParmValue);
+	string_set(ptr, pszParmValue);
 
-    /* Do any other initialisation required for vfs.  Note that
-       anything done here may have linking repercussions in nmbd. */
+	/* Do any other initialisation required for vfs.  Note that
+	   anything done here may have linking repercussions in nmbd. */
 
-    return True;
+	return True;
 }
 
 /***************************************************************************
   handle the interpretation of the coding system parameter
   *************************************************************************/
-static BOOL handle_coding_system(char *pszParmValue,char **ptr)
+static BOOL handle_coding_system(char *pszParmValue, char **ptr)
 {
-	string_set(ptr,pszParmValue);
+	string_set(ptr, pszParmValue);
 	interpret_coding_system(pszParmValue);
-	return(True);
+	return (True);
 }
 
 /***************************************************************************
@@ -2104,16 +2472,16 @@ static BOOL handle_coding_system(char *pszParmValue,char **ptr)
 
 static char *saved_character_set = NULL;
 
-static BOOL handle_character_set(char *pszParmValue,char **ptr)
+static BOOL handle_character_set(char *pszParmValue, char **ptr)
 {
-    /* A dependency here is that the parameter client code page should be
-      set before this is called.
-    */
-	string_set(ptr,pszParmValue);
+	/* A dependency here is that the parameter client code page should be
+	   set before this is called.
+	 */
+	string_set(ptr, pszParmValue);
 	strupper(*ptr);
 	saved_character_set = strdup(*ptr);
-	interpret_character_set(*ptr,lp_client_code_page());
-	return(True);
+	interpret_character_set(*ptr, lp_client_code_page());
+	return (True);
 }
 
 /***************************************************************************
@@ -2122,97 +2490,99 @@ static BOOL handle_character_set(char *pszParmValue,char **ptr)
  parameter in case this came before 'client code page' in the smb.conf.
 ***************************************************************************/
 
-static BOOL handle_client_code_page(char *pszParmValue,char **ptr)
+static BOOL handle_client_code_page(char *pszParmValue, char **ptr)
 {
 	Globals.client_code_page = atoi(pszParmValue);
 	if (saved_character_set != NULL)
-		interpret_character_set(saved_character_set,lp_client_code_page());	
-	return(True);
+		interpret_character_set(saved_character_set,
+					lp_client_code_page());
+	return (True);
 }
 
 /***************************************************************************
 handle the valid chars lines
 ***************************************************************************/
 
-static BOOL handle_valid_chars(char *pszParmValue,char **ptr)
-{ 
-  string_set(ptr,pszParmValue);
+static BOOL handle_valid_chars(char *pszParmValue, char **ptr)
+{
+	string_set(ptr, pszParmValue);
 
-  /* A dependency here is that the parameter client code page must be
-     set before this is called - as calling codepage_initialise()
-     would overwrite the valid char lines.
-   */
-  codepage_initialise(lp_client_code_page());
+	/* A dependency here is that the parameter client code page must be
+	   set before this is called - as calling codepage_initialise()
+	   would overwrite the valid char lines.
+	 */
+	codepage_initialise(lp_client_code_page());
 
-  add_char_string(pszParmValue);
-  return(True);
+	add_char_string(pszParmValue);
+	return (True);
 }
 
 /***************************************************************************
 handle the include operation
 ***************************************************************************/
 
-static BOOL handle_include(char *pszParmValue,char **ptr)
-{ 
-  pstring fname;
-  pstrcpy(fname,pszParmValue);
+static BOOL handle_include(char *pszParmValue, char **ptr)
+{
+	pstring fname;
+	pstrcpy(fname, pszParmValue);
 
-  add_to_file_list(fname);
+	add_to_file_list(fname);
 
-  standard_sub_basic(fname);
+	standard_sub_basic(fname);
 
-  string_set(ptr,fname);
+	string_set(ptr, fname);
 
-  if (file_exist(fname,NULL))
-    return(pm_process(fname, do_section, do_parameter));      
+	if (file_exist(fname, NULL))
+		return (pm_process(fname, do_section, do_parameter));
 
-  DEBUG(2,("Can't find include file %s\n",fname));
+	DEBUG(2, ("Can't find include file %s\n", fname));
 
-  return(False);
+	return (False);
 }
 
 
 /***************************************************************************
 handle the interpretation of the copy parameter
 ***************************************************************************/
-static BOOL handle_copy(char *pszParmValue,char **ptr)
+static BOOL handle_copy(char *pszParmValue, char **ptr)
 {
-   BOOL bRetval;
-   int iTemp;
-   service serviceTemp;
+	BOOL bRetval;
+	int iTemp;
+	service serviceTemp;
 
-   string_set(ptr,pszParmValue);
+	string_set(ptr, pszParmValue);
 
-   init_service(&serviceTemp);
+	init_service(&serviceTemp);
 
-   bRetval = False;
-   
-   DEBUG(3,("Copying service from service %s\n",pszParmValue));
-
-   if ((iTemp = getservicebyname(pszParmValue, &serviceTemp)) >= 0)
-     {
-       if (iTemp == iServiceIndex)
-	 {
-	   DEBUG(0,("Can't copy service %s - unable to copy self!\n",
-		    pszParmValue));
-	 }
-       else
-	 {
-	   copy_service(pSERVICE(iServiceIndex), 
-			&serviceTemp,
-			iSERVICE(iServiceIndex).copymap);
-	   bRetval = True;
-	 }
-     }
-   else
-     {
-       DEBUG(0,( "Unable to copy service - source not found: %s\n",
-		pszParmValue));
-       bRetval = False;
-     }
-
-   free_service(&serviceTemp);
-   return (bRetval);
+	bRetval = False;
+
+	DEBUG(3, ("Copying service from service %s\n", pszParmValue));
+
+	if ((iTemp = getservicebyname(pszParmValue, &serviceTemp)) >= 0)
+	{
+		if (iTemp == iServiceIndex)
+		{
+			DEBUG(0,
+			      ("Can't copy service %s - unable to copy self!\n",
+			       pszParmValue));
+		}
+		else
+		{
+			copy_service(pSERVICE(iServiceIndex),
+				     &serviceTemp,
+				     iSERVICE(iServiceIndex).copymap);
+			bRetval = True;
+		}
+	}
+	else
+	{
+		DEBUG(0, ("Unable to copy service - source not found: %s\n",
+			  pszParmValue));
+		bRetval = False;
+	}
+
+	free_service(&serviceTemp);
+	return (bRetval);
 }
 
 /***************************************************************************
@@ -2233,32 +2603,36 @@ static BOOL handle_copy(char *pszParmValue,char **ptr)
 
 static BOOL handle_winbind_id(char *pszParmValue, char **ptr)
 {
-    int low, high;
+	int low, high;
 
-    if (sscanf(pszParmValue, "%d-%d", &low, &high) != 2) {
-        return False;
-    }
+	if (sscanf(pszParmValue, "%d-%d", &low, &high) != 2)
+	{
+		return False;
+	}
 
-    /* Parse OK */
+	/* Parse OK */
 
-    string_set(ptr,pszParmValue);
+	string_set(ptr, pszParmValue);
 
-    return True;
+	return True;
 }
 
 /***************************************************************************
 initialise a copymap
 ***************************************************************************/
-static void init_copymap(service *pservice)
+static void init_copymap(service * pservice)
 {
-  int i;
-  if (pservice->copymap) free(pservice->copymap);
-  pservice->copymap = (BOOL *)malloc(sizeof(BOOL)*NUMPARAMETERS);
-  if (!pservice->copymap)
-    DEBUG(0,("Couldn't allocate copymap!! (size %d)\n",(int)NUMPARAMETERS));
-  else
-    for (i=0;i<NUMPARAMETERS;i++)
-      pservice->copymap[i] = True;
+	int i;
+	if (pservice->copymap)
+		free(pservice->copymap);
+	pservice->copymap = (BOOL *)malloc(sizeof(BOOL) * NUMPARAMETERS);
+	if (!pservice->copymap)
+		DEBUG(0,
+		      ("Couldn't allocate copymap!! (size %d)\n",
+		       (int)NUMPARAMETERS));
+	else
+		for (i = 0; i < NUMPARAMETERS; i++)
+			pservice->copymap[i] = True;
 }
 
 
@@ -2268,7 +2642,7 @@ static void init_copymap(service *pservice)
 ***************************************************************************/
 void *lp_local_ptr(int snum, void *ptr)
 {
-	return (void *)(((char *)pSERVICE(snum)) + PTR_DIFF(ptr,&sDefault));
+	return (void *)(((char *)pSERVICE(snum)) + PTR_DIFF(ptr, &sDefault));
 }
 
 /***************************************************************************
@@ -2277,183 +2651,205 @@ then assume we are in the globals
 ***************************************************************************/
 BOOL lp_do_parameter(int snum, char *pszParmName, char *pszParmValue)
 {
-   int parmnum, i;
-   void *parm_ptr=NULL; /* where we are going to store the result */
-   void *def_ptr=NULL;
-
-   parmnum = map_parameter(pszParmName);
-
-   if (parmnum < 0)
-     {
-       DEBUG(0,( "Ignoring unknown parameter \"%s\"\n", pszParmName));
-       return(True);
-     }
-
-   if (parm_table[parmnum].flags & FLAG_DEPRECATED) {
-	   DEBUG(1,("WARNING: The \"%s\"option is deprecated\n",
-		    pszParmName));
-   }
-
-   def_ptr = parm_table[parmnum].ptr;
-
-   /* we might point at a service, the default service or a global */
-   if (snum < 0) {
-     parm_ptr = def_ptr;
-   } else {
-       if (parm_table[parmnum].class == P_GLOBAL) {
-	   DEBUG(0,( "Global parameter %s found in service section!\n",pszParmName));
-	   return(True);
-	 }
-       parm_ptr = ((char *)pSERVICE(snum)) + PTR_DIFF(def_ptr,&sDefault);
-   }
-
-   if (snum >= 0) {
-	   if (!iSERVICE(snum).copymap)
-		   init_copymap(pSERVICE(snum));
-	   
-	   /* this handles the aliases - set the copymap for other entries with
-	      the same data pointer */
-	   for (i=0;parm_table[i].label;i++)
-		   if (parm_table[i].ptr == parm_table[parmnum].ptr)
-			   iSERVICE(snum).copymap[i] = False;
-   }
-
-   /* if it is a special case then go ahead */
-   if (parm_table[parmnum].special) {
-	   parm_table[parmnum].special(pszParmValue,(char **)parm_ptr);
-	   return(True);
-   }
-
-   /* now switch on the type of variable it is */
-   switch (parm_table[parmnum].type)
-     {
-     case P_BOOL:
-       set_boolean(parm_ptr,pszParmValue);
-       break;
-
-     case P_BOOLREV:
-       set_boolean(parm_ptr,pszParmValue);
-       *(BOOL *)parm_ptr = ! *(BOOL *)parm_ptr;
-       break;
-
-     case P_INTEGER:
-       *(int *)parm_ptr = atoi(pszParmValue);
-       break;
-
-     case P_CHAR:
-       *(char *)parm_ptr = *pszParmValue;
-       break;
-
-     case P_OCTAL:
-       sscanf(pszParmValue,"%o",(int *)parm_ptr);
-       break;
-
-     case P_STRING:
-       string_set(parm_ptr,pszParmValue);
-       if (parm_table[parmnum].flags & FLAG_DOS_STRING)
-           unix_to_dos(*(char **)parm_ptr, True);
-       break;
-
-     case P_USTRING:
-       string_set(parm_ptr,pszParmValue);
-       if (parm_table[parmnum].flags & FLAG_DOS_STRING)
-           unix_to_dos(*(char **)parm_ptr, True);
-       strupper(*(char **)parm_ptr);
-       break;
-
-     case P_GSTRING:
-       pstrcpy((char *)parm_ptr,pszParmValue);
-       if (parm_table[parmnum].flags & FLAG_DOS_STRING)
-           unix_to_dos((char *)parm_ptr, True);
-       break;
-
-     case P_UGSTRING:
-       pstrcpy((char *)parm_ptr,pszParmValue);
-       if (parm_table[parmnum].flags & FLAG_DOS_STRING)
-           unix_to_dos((char *)parm_ptr, True);
-       strupper((char *)parm_ptr);
-       break;
-
-     case P_ENUM:
-	     for (i=0;parm_table[parmnum].enum_list[i].name;i++) {
-		     if (strequal(pszParmValue, parm_table[parmnum].enum_list[i].name)) {
-			     *(int *)parm_ptr = parm_table[parmnum].enum_list[i].value;
-			     break;
-		     }
-	     }
-	     break;
-     case P_SEP:
-	     break;
-     }
-
-   return(True);
+	int parmnum, i;
+	void *parm_ptr = NULL;	/* where we are going to store the result */
+	void *def_ptr = NULL;
+
+	parmnum = map_parameter(pszParmName);
+
+	if (parmnum < 0)
+	{
+		DEBUG(0,
+		      ("Ignoring unknown parameter \"%s\"\n", pszParmName));
+		return (True);
+	}
+
+	if (parm_table[parmnum].flags & FLAG_DEPRECATED)
+	{
+		DEBUG(1, ("WARNING: The \"%s\"option is deprecated\n",
+			  pszParmName));
+	}
+
+	def_ptr = parm_table[parmnum].ptr;
+
+	/* we might point at a service, the default service or a global */
+	if (snum < 0)
+	{
+		parm_ptr = def_ptr;
+	}
+	else
+	{
+		if (parm_table[parmnum].class == P_GLOBAL)
+		{
+			DEBUG(0,
+			      ("Global parameter %s found in service section!\n",
+			       pszParmName));
+			return (True);
+		}
+		parm_ptr =
+			((char *)pSERVICE(snum)) + PTR_DIFF(def_ptr,
+							    &sDefault);
+	}
+
+	if (snum >= 0)
+	{
+		if (!iSERVICE(snum).copymap)
+			init_copymap(pSERVICE(snum));
+
+		/* this handles the aliases - set the copymap for other entries with
+		   the same data pointer */
+		for (i = 0; parm_table[i].label; i++)
+			if (parm_table[i].ptr == parm_table[parmnum].ptr)
+				iSERVICE(snum).copymap[i] = False;
+	}
+
+	/* if it is a special case then go ahead */
+	if (parm_table[parmnum].special)
+	{
+		parm_table[parmnum].special(pszParmValue, (char **)parm_ptr);
+		return (True);
+	}
+
+	/* now switch on the type of variable it is */
+	switch (parm_table[parmnum].type)
+	{
+		case P_BOOL:
+			set_boolean(parm_ptr, pszParmValue);
+			break;
+
+		case P_BOOLREV:
+			set_boolean(parm_ptr, pszParmValue);
+			*(BOOL *)parm_ptr = !*(BOOL *)parm_ptr;
+			break;
+
+		case P_INTEGER:
+			*(int *)parm_ptr = atoi(pszParmValue);
+			break;
+
+		case P_CHAR:
+			*(char *)parm_ptr = *pszParmValue;
+			break;
+
+		case P_OCTAL:
+			sscanf(pszParmValue, "%o", (int *)parm_ptr);
+			break;
+
+		case P_STRING:
+			string_set(parm_ptr, pszParmValue);
+			if (parm_table[parmnum].flags & FLAG_DOS_STRING)
+				unix_to_dos(*(char **)parm_ptr, True);
+			break;
+
+		case P_USTRING:
+			string_set(parm_ptr, pszParmValue);
+			if (parm_table[parmnum].flags & FLAG_DOS_STRING)
+				unix_to_dos(*(char **)parm_ptr, True);
+			strupper(*(char **)parm_ptr);
+			break;
+
+		case P_GSTRING:
+			pstrcpy((char *)parm_ptr, pszParmValue);
+			if (parm_table[parmnum].flags & FLAG_DOS_STRING)
+				unix_to_dos((char *)parm_ptr, True);
+			break;
+
+		case P_UGSTRING:
+			pstrcpy((char *)parm_ptr, pszParmValue);
+			if (parm_table[parmnum].flags & FLAG_DOS_STRING)
+				unix_to_dos((char *)parm_ptr, True);
+			strupper((char *)parm_ptr);
+			break;
+
+		case P_ENUM:
+			for (i = 0; parm_table[parmnum].enum_list[i].name;
+			     i++)
+			{
+				if (strequal
+				    (pszParmValue,
+				     parm_table[parmnum].enum_list[i].name))
+				{
+					*(int *)parm_ptr =
+						parm_table[parmnum].
+						enum_list[i].value;
+					break;
+				}
+			}
+			break;
+		case P_SEP:
+			break;
+	}
+
+	return (True);
 }
 
 /***************************************************************************
 Process a parameter.
 ***************************************************************************/
-static BOOL do_parameter( char *pszParmName, char *pszParmValue )
+static BOOL do_parameter(char *pszParmName, char *pszParmValue)
 {
-  if( !bInGlobalSection && bGlobalOnly )
-    return(True);
+	if (!bInGlobalSection && bGlobalOnly)
+		return (True);
 
-  DEBUGADD( 3, ( "doing parameter %s = %s\n", pszParmName, pszParmValue ) );
+	DEBUGADD(3, ("doing parameter %s = %s\n", pszParmName, pszParmValue));
 
-  return( lp_do_parameter( bInGlobalSection ? -2 : iServiceIndex,
-                           pszParmName,
-                           pszParmValue ) );
+	return (lp_do_parameter(bInGlobalSection ? -2 : iServiceIndex,
+				pszParmName, pszParmValue));
 }
 
 
 /***************************************************************************
 print a parameter of the specified type
 ***************************************************************************/
-static void print_parameter(struct parm_struct *p,void *ptr, FILE *f)
+static void print_parameter(struct parm_struct *p, void *ptr, FILE * f)
 {
 	int i;
-	switch (p->type) {
-	case P_ENUM:
-		for (i=0;p->enum_list[i].name;i++) {
-			if (*(int *)ptr == p->enum_list[i].value) {
-				fprintf(f,"%s",p->enum_list[i].name);
-				break;
+	switch (p->type)
+	{
+		case P_ENUM:
+			for (i = 0; p->enum_list[i].name; i++)
+			{
+				if (*(int *)ptr == p->enum_list[i].value)
+				{
+					fprintf(f, "%s",
+						p->enum_list[i].name);
+					break;
+				}
 			}
-		}
-		break;
-
-	case P_BOOL:
-		fprintf(f,"%s",BOOLSTR(*(BOOL *)ptr));
-		break;
-      
-	case P_BOOLREV:
-		fprintf(f,"%s",BOOLSTR(! *(BOOL *)ptr));
-		break;
-      
-	case P_INTEGER:
-		fprintf(f,"%d",*(int *)ptr);
-		break;
-      
-	case P_CHAR:
-		fprintf(f,"%c",*(char *)ptr);
-		break;
-      
-	case P_OCTAL:
-		fprintf(f,"%s",octal_string(*(int *)ptr));
-		break;
-      
-	case P_GSTRING:
-	case P_UGSTRING:
-		if ((char *)ptr)
-			fprintf(f,"%s",(char *)ptr);
-		break;
-		
-	case P_STRING:
-	case P_USTRING:
-		if (*(char **)ptr)
-			fprintf(f,"%s",*(char **)ptr);
-		break;
-	case P_SEP:
-		break;
+			break;
+
+		case P_BOOL:
+			fprintf(f, "%s", BOOLSTR(*(BOOL *)ptr));
+			break;
+
+		case P_BOOLREV:
+			fprintf(f, "%s", BOOLSTR(!*(BOOL *)ptr));
+			break;
+
+		case P_INTEGER:
+			fprintf(f, "%d", *(int *)ptr);
+			break;
+
+		case P_CHAR:
+			fprintf(f, "%c", *(char *)ptr);
+			break;
+
+		case P_OCTAL:
+			fprintf(f, "%s", octal_string(*(int *)ptr));
+			break;
+
+		case P_GSTRING:
+		case P_UGSTRING:
+			if ((char *)ptr)
+				fprintf(f, "%s", (char *)ptr);
+			break;
+
+		case P_STRING:
+		case P_USTRING:
+			if (*(char **)ptr)
+				fprintf(f, "%s", *(char **)ptr);
+			break;
+		case P_SEP:
+			break;
 	}
 }
 
@@ -2461,42 +2857,46 @@ static void print_parameter(struct parm_struct *p,void *ptr, FILE *f)
 /***************************************************************************
 check if two parameters are equal
 ***************************************************************************/
-static BOOL equal_parameter(parm_type type,void *ptr1,void *ptr2)
-{
-  switch (type)
-    {
-    case P_BOOL:
-    case P_BOOLREV:
-      return(*((BOOL *)ptr1) == *((BOOL *)ptr2));
-
-    case P_INTEGER:
-    case P_ENUM:
-    case P_OCTAL:
-      return(*((int *)ptr1) == *((int *)ptr2));
-      
-    case P_CHAR:
-      return(*((char *)ptr1) == *((char *)ptr2));
-
-    case P_GSTRING:
-    case P_UGSTRING:
-      {
-	char *p1 = (char *)ptr1, *p2 = (char *)ptr2;
-	if (p1 && !*p1) p1 = NULL;
-	if (p2 && !*p2) p2 = NULL;
-	return(p1==p2 || strequal(p1,p2));
-      }
-    case P_STRING:
-    case P_USTRING:
-      {
-	char *p1 = *(char **)ptr1, *p2 = *(char **)ptr2;
-	if (p1 && !*p1) p1 = NULL;
-	if (p2 && !*p2) p2 = NULL;
-	return(p1==p2 || strequal(p1,p2));
-      }
-     case P_SEP:
-	     break;
-    }
-  return(False);
+static BOOL equal_parameter(parm_type type, void *ptr1, void *ptr2)
+{
+	switch (type)
+	{
+		case P_BOOL:
+		case P_BOOLREV:
+			return (*((BOOL *)ptr1) == *((BOOL *)ptr2));
+
+		case P_INTEGER:
+		case P_ENUM:
+		case P_OCTAL:
+			return (*((int *)ptr1) == *((int *)ptr2));
+
+		case P_CHAR:
+			return (*((char *)ptr1) == *((char *)ptr2));
+
+		case P_GSTRING:
+		case P_UGSTRING:
+		{
+			char *p1 = (char *)ptr1, *p2 = (char *)ptr2;
+			if (p1 && !*p1)
+				p1 = NULL;
+			if (p2 && !*p2)
+				p2 = NULL;
+			return (p1 == p2 || strequal(p1, p2));
+		}
+		case P_STRING:
+		case P_USTRING:
+		{
+			char *p1 = *(char **)ptr1, *p2 = *(char **)ptr2;
+			if (p1 && !*p1)
+				p1 = NULL;
+			if (p2 && !*p2)
+				p2 = NULL;
+			return (p1 == p2 || strequal(p1, p2));
+		}
+		case P_SEP:
+			break;
+	}
+	return (False);
 }
 
 /***************************************************************************
@@ -2506,48 +2906,50 @@ Returns True on success, False on failure.
 ***************************************************************************/
 static BOOL do_section(char *pszSectionName)
 {
-   BOOL bRetval;
-   BOOL isglobal = ((strwicmp(pszSectionName, GLOBAL_NAME) == 0) || 
-		    (strwicmp(pszSectionName, GLOBAL_NAME2) == 0));
-   bRetval = False;
+	BOOL bRetval;
+	BOOL isglobal = ((strwicmp(pszSectionName, GLOBAL_NAME) == 0) ||
+			 (strwicmp(pszSectionName, GLOBAL_NAME2) == 0));
+	bRetval = False;
 
-   /* if we were in a global section then do the local inits */
-   if (bInGlobalSection && !isglobal)
-     init_locals();
+	/* if we were in a global section then do the local inits */
+	if (bInGlobalSection && !isglobal)
+		init_locals();
 
-   /* if we've just struck a global section, note the fact. */
-   bInGlobalSection = isglobal;   
+	/* if we've just struck a global section, note the fact. */
+	bInGlobalSection = isglobal;
 
-   /* check for multiple global sections */
-   if (bInGlobalSection)
-   {
-     DEBUG( 3, ( "Processing section \"[%s]\"\n", pszSectionName ) );
-     return(True);
-   }
+	/* check for multiple global sections */
+	if (bInGlobalSection)
+	{
+		DEBUG(3, ("Processing section \"[%s]\"\n", pszSectionName));
+		return (True);
+	}
 
-   if (!bInGlobalSection && bGlobalOnly) return(True);
+	if (!bInGlobalSection && bGlobalOnly)
+		return (True);
 
-   /* if we have a current service, tidy it up before moving on */
-   bRetval = True;
+	/* if we have a current service, tidy it up before moving on */
+	bRetval = True;
 
-   if (iServiceIndex >= 0)
-     bRetval = service_ok(iServiceIndex);
+	if (iServiceIndex >= 0)
+		bRetval = service_ok(iServiceIndex);
 
-   /* if all is still well, move to the next record in the services array */
-   if (bRetval)
-     {
-       /* We put this here to avoid an odd message order if messages are */
-       /* issued by the post-processing of a previous section. */
-       DEBUG(2,( "Processing section \"[%s]\"\n", pszSectionName));
+	/* if all is still well, move to the next record in the services array */
+	if (bRetval)
+	{
+		/* We put this here to avoid an odd message order if messages are */
+		/* issued by the post-processing of a previous section. */
+		DEBUG(2, ("Processing section \"[%s]\"\n", pszSectionName));
 
-       if ((iServiceIndex=add_a_service(&sDefault,pszSectionName)) < 0)
-	 {
-	   DEBUG(0,("Failed to add a new service\n"));
-	   return(False);
-	 }
-     }
+		if ((iServiceIndex = add_a_service(&sDefault, pszSectionName))
+		    < 0)
+		{
+			DEBUG(0, ("Failed to add a new service\n"));
+			return (False);
+		}
+	}
 
-   return (bRetval);
+	return (bRetval);
 }
 
 
@@ -2556,25 +2958,32 @@ determine if a partcular base parameter is currently set to the default value.
 ***************************************************************************/
 static BOOL is_default(int i)
 {
-	if (!defaults_saved) return False;
-	switch (parm_table[i].type) {
-	case P_STRING:
-	case P_USTRING:
-		return strequal(parm_table[i].def.svalue,*(char **)parm_table[i].ptr);
-	case P_GSTRING:
-	case P_UGSTRING:
-		return strequal(parm_table[i].def.svalue,(char *)parm_table[i].ptr);
-	case P_BOOL:
-	case P_BOOLREV:
-		return parm_table[i].def.bvalue == *(BOOL *)parm_table[i].ptr;
-	case P_CHAR:
-		return parm_table[i].def.cvalue == *(char *)parm_table[i].ptr;
-	case P_INTEGER:
-	case P_OCTAL:
-	case P_ENUM:
-		return parm_table[i].def.ivalue == *(int *)parm_table[i].ptr;
-	case P_SEP:
-		break;
+	if (!defaults_saved)
+		return False;
+	switch (parm_table[i].type)
+	{
+		case P_STRING:
+		case P_USTRING:
+			return strequal(parm_table[i].def.svalue,
+					*(char **)parm_table[i].ptr);
+		case P_GSTRING:
+		case P_UGSTRING:
+			return strequal(parm_table[i].def.svalue,
+					(char *)parm_table[i].ptr);
+		case P_BOOL:
+		case P_BOOLREV:
+			return parm_table[i].def.bvalue ==
+				*(BOOL *)parm_table[i].ptr;
+		case P_CHAR:
+			return parm_table[i].def.cvalue ==
+				*(char *)parm_table[i].ptr;
+		case P_INTEGER:
+		case P_OCTAL:
+		case P_ENUM:
+			return parm_table[i].def.ivalue ==
+				*(int *)parm_table[i].ptr;
+		case P_SEP:
+			break;
 	}
 	return False;
 }
@@ -2583,19 +2992,21 @@ static BOOL is_default(int i)
 /***************************************************************************
 Display the contents of the global structure.
 ***************************************************************************/
-static void dump_globals(FILE *f)
+static void dump_globals(FILE * f)
 {
 	int i;
 	fprintf(f, "# Global parameters\n[global]\n");
-	
-	for (i=0;parm_table[i].label;i++)
+
+	for (i = 0; parm_table[i].label; i++)
 		if (parm_table[i].class == P_GLOBAL &&
 		    parm_table[i].ptr &&
-		    (i == 0 || (parm_table[i].ptr != parm_table[i-1].ptr))) {
-			if (defaults_saved && is_default(i)) continue;
-			fprintf(f,"\t%s = ",parm_table[i].label);
-			print_parameter(&parm_table[i],parm_table[i].ptr, f);
-			fprintf(f,"\n");
+		    (i == 0 || (parm_table[i].ptr != parm_table[i - 1].ptr)))
+		{
+			if (defaults_saved && is_default(i))
+				continue;
+			fprintf(f, "\t%s = ", parm_table[i].label);
+			print_parameter(&parm_table[i], parm_table[i].ptr, f);
+			fprintf(f, "\n");
 		}
 }
 
@@ -2604,8 +3015,8 @@ return True if a local parameter is currently set to the global default
 ***************************************************************************/
 BOOL lp_is_default(int snum, struct parm_struct *parm)
 {
-	int pdiff = PTR_DIFF(parm->ptr,&sDefault);
-			
+	int pdiff = PTR_DIFF(parm->ptr, &sDefault);
+
 	return equal_parameter(parm->type,
 			       ((char *)pSERVICE(snum)) + pdiff,
 			       ((char *)&sDefault) + pdiff);
@@ -2615,32 +3026,39 @@ BOOL lp_is_default(int snum, struct parm_struct *parm)
 /***************************************************************************
 Display the contents of a single services record.
 ***************************************************************************/
-static void dump_a_service(service *pService, FILE *f)
+static void dump_a_service(service * pService, FILE * f)
 {
 	int i;
 	if (pService != &sDefault)
-		fprintf(f,"\n[%s]\n",pService->szService);
+		fprintf(f, "\n[%s]\n", pService->szService);
 
-	for (i=0;parm_table[i].label;i++)
+	for (i = 0; parm_table[i].label; i++)
 		if (parm_table[i].class == P_LOCAL &&
-		    parm_table[i].ptr && 
+		    parm_table[i].ptr &&
 		    (*parm_table[i].label != '-') &&
-		    (i == 0 || (parm_table[i].ptr != parm_table[i-1].ptr))) {
-			int pdiff = PTR_DIFF(parm_table[i].ptr,&sDefault);
-			
-			if (pService == &sDefault) {
-				if (defaults_saved && is_default(i)) continue;
-			} else {
+		    (i == 0 || (parm_table[i].ptr != parm_table[i - 1].ptr)))
+		{
+			int pdiff = PTR_DIFF(parm_table[i].ptr, &sDefault);
+
+			if (pService == &sDefault)
+			{
+				if (defaults_saved && is_default(i))
+					continue;
+			}
+			else
+			{
 				if (equal_parameter(parm_table[i].type,
-						    ((char *)pService) + pdiff,
-						    ((char *)&sDefault) + pdiff)) 
+						    ((char *)pService) +
+						    pdiff,
+						    ((char *)&sDefault) +
+						    pdiff))
 					continue;
 			}
 
-			fprintf(f,"\t%s = ",parm_table[i].label);
+			fprintf(f, "\t%s = ", parm_table[i].label);
 			print_parameter(&parm_table[i],
 					((char *)pService) + pdiff, f);
-			fprintf(f,"\n");
+			fprintf(f, "\n");
 		}
 }
 
@@ -2652,38 +3070,53 @@ return NULL when out of parameters
 ***************************************************************************/
 struct parm_struct *lp_next_parameter(int snum, int *i, int allparameters)
 {
-	if (snum == -1) {
+	if (snum == -1)
+	{
 		/* do the globals */
-		for (;parm_table[*i].label;(*i)++) {
-			if (parm_table[*i].class == P_SEPARATOR) 
+		for (; parm_table[*i].label; (*i)++)
+		{
+			if (parm_table[*i].class == P_SEPARATOR)
 				return &parm_table[(*i)++];
 
-			if (!parm_table[*i].ptr || (*parm_table[*i].label == '-'))
+			if (!parm_table[*i].ptr
+			    || (*parm_table[*i].label == '-'))
 				continue;
-			
-			if ((*i) > 0 && (parm_table[*i].ptr == parm_table[(*i)-1].ptr))
+
+			if ((*i) > 0
+			    && (parm_table[*i].ptr ==
+				parm_table[(*i) - 1].ptr))
 				continue;
 
 			return &parm_table[(*i)++];
 		}
-	} else {
+	}
+	else
+	{
 		service *pService = pSERVICE(snum);
 
-		for (;parm_table[*i].label;(*i)++) {
-			if (parm_table[*i].class == P_SEPARATOR) 
+		for (; parm_table[*i].label; (*i)++)
+		{
+			if (parm_table[*i].class == P_SEPARATOR)
 				return &parm_table[(*i)++];
 
 			if (parm_table[*i].class == P_LOCAL &&
-			    parm_table[*i].ptr && 
+			    parm_table[*i].ptr &&
 			    (*parm_table[*i].label != '-') &&
-			    ((*i) == 0 || 
-			     (parm_table[*i].ptr != parm_table[(*i)-1].ptr))) {
-				int pdiff = PTR_DIFF(parm_table[*i].ptr,&sDefault);
-				
+			    ((*i) == 0 ||
+			     (parm_table[*i].ptr !=
+			      parm_table[(*i) - 1].ptr)))
+			{
+				int pdiff =
+					PTR_DIFF(parm_table[*i].ptr,
+						 &sDefault);
+
 				if (allparameters ||
 				    !equal_parameter(parm_table[*i].type,
-						     ((char *)pService) + pdiff,
-						     ((char *)&sDefault) + pdiff)) {
+						     ((char *)pService) +
+						     pdiff,
+						     ((char *)&sDefault) +
+						     pdiff))
+				{
 					return &parm_table[(*i)++];
 				}
 			}
@@ -2700,18 +3133,19 @@ Display the contents of a single copy structure.
 ***************************************************************************/
 static void dump_copy_map(BOOL *pcopymap)
 {
-  int i;
-  if (!pcopymap) return;
+	int i;
+	if (!pcopymap)
+		return;
 
-  printf("\n\tNon-Copied parameters:\n");
+	printf("\n\tNon-Copied parameters:\n");
 
-  for (i=0;parm_table[i].label;i++)
-    if (parm_table[i].class == P_LOCAL &&
-	parm_table[i].ptr && !pcopymap[i] &&
-	(i == 0 || (parm_table[i].ptr != parm_table[i-1].ptr)))
-      {
-	printf("\t\t%s\n",parm_table[i].label);
-      }
+	for (i = 0; parm_table[i].label; i++)
+		if (parm_table[i].class == P_LOCAL &&
+		    parm_table[i].ptr && !pcopymap[i] &&
+		    (i == 0 || (parm_table[i].ptr != parm_table[i - 1].ptr)))
+		{
+			printf("\t\t%s\n", parm_table[i].label);
+		}
 }
 #endif
 
@@ -2720,7 +3154,7 @@ Return TRUE if the passed service number is within range.
 ***************************************************************************/
 BOOL lp_snum_ok(int iService)
 {
-   return (LP_SNUM_OK(iService) && iSERVICE(iService).bAvailable);
+	return (LP_SNUM_OK(iService) && iSERVICE(iService).bAvailable);
 }
 
 
@@ -2733,20 +3167,25 @@ static void lp_add_auto_services(char *str)
 	char *p;
 	int homes;
 
-	if (!str) return;
+	if (!str)
+		return;
 
 	s = strdup(str);
-	if (!s) return;
+	if (!s)
+		return;
 
 	homes = lp_servicenumber(HOMES_NAME);
-	
-	for (p=strtok(s,LIST_SEP);p;p=strtok(NULL,LIST_SEP)) {
+
+	for (p = strtok(s, LIST_SEP); p; p = strtok(NULL, LIST_SEP))
+	{
 		char *home = get_user_home_dir(p);
-		
-		if (lp_servicenumber(p) >= 0) continue;
-		
-		if (home && homes >= 0) {
-			lp_add_home(p,homes,home);
+
+		if (lp_servicenumber(p) >= 0)
+			continue;
+
+		if (home && homes >= 0)
+		{
+			lp_add_home(p, homes, home);
 		}
 	}
 	free(s);
@@ -2755,15 +3194,17 @@ static void lp_add_auto_services(char *str)
 /***************************************************************************
 auto-load one printer
 ***************************************************************************/
-void lp_add_one_printer(char *name,char *comment)
+void lp_add_one_printer(char *name, char *comment)
 {
 	int printers = lp_servicenumber(PRINTERS_NAME);
 	int i;
 
-	if (lp_servicenumber(name) < 0)  {
-		lp_add_printer(name,printers);
-		if ((i=lp_servicenumber(name)) >= 0) {
-			string_set(&iSERVICE(i).comment,comment);
+	if (lp_servicenumber(name) < 0)
+	{
+		lp_add_printer(name, printers);
+		if ((i = lp_servicenumber(name)) >= 0)
+		{
+			string_set(&iSERVICE(i).comment, comment);
 			iSERVICE(i).autoloaded = True;
 		}
 	}
@@ -2774,19 +3215,22 @@ have we loaded a services file yet?
 ***************************************************************************/
 BOOL lp_loaded(void)
 {
-	return(bLoaded);
+	return (bLoaded);
 }
 
 /***************************************************************************
 unload unused services
 ***************************************************************************/
-void lp_killunused(BOOL (*snumused)(int ))
+void lp_killunused(BOOL (*snumused) (int))
 {
 	int i;
-	for (i=0;i<iNumServices;i++) {
-		if (!VALID(i)) continue;
+	for (i = 0; i < iNumServices; i++)
+	{
+		if (!VALID(i))
+			continue;
 
-		if (!snumused || !snumused(i)) {
+		if (!snumused || !snumused(i))
+		{
 			iSERVICE(i).valid = False;
 			free_service(pSERVICE(i));
 		}
@@ -2802,34 +3246,88 @@ changed (ie. non-default) parameters.
 static void lp_save_defaults(void)
 {
 	int i;
-	for (i = 0; parm_table[i].label; i++) {
-		if (i>0 && parm_table[i].ptr == parm_table[i-1].ptr) continue;
-		switch (parm_table[i].type) {
-		case P_STRING:
-		case P_USTRING:
-			parm_table[i].def.svalue = strdup(*(char **)parm_table[i].ptr);
-			break;
-		case P_GSTRING:
-		case P_UGSTRING:
-			parm_table[i].def.svalue = strdup((char *)parm_table[i].ptr);
-			break;
-		case P_BOOL:
-		case P_BOOLREV:
-			parm_table[i].def.bvalue = *(BOOL *)parm_table[i].ptr;
-			break;
-		case P_CHAR:
-			parm_table[i].def.cvalue = *(char *)parm_table[i].ptr;
+	for (i = 0; parm_table[i].label; i++)
+	{
+		if (i > 0 && parm_table[i].ptr == parm_table[i - 1].ptr)
+			continue;
+		switch (parm_table[i].type)
+		{
+			case P_STRING:
+			case P_USTRING:
+				parm_table[i].def.svalue =
+					strdup(*(char **)parm_table[i].ptr);
+				break;
+			case P_GSTRING:
+			case P_UGSTRING:
+				parm_table[i].def.svalue =
+					strdup((char *)parm_table[i].ptr);
+				break;
+			case P_BOOL:
+			case P_BOOLREV:
+				parm_table[i].def.bvalue =
+					*(BOOL *)parm_table[i].ptr;
+				break;
+			case P_CHAR:
+				parm_table[i].def.cvalue =
+					*(char *)parm_table[i].ptr;
+				break;
+			case P_INTEGER:
+			case P_OCTAL:
+			case P_ENUM:
+				parm_table[i].def.ivalue =
+					*(int *)parm_table[i].ptr;
+				break;
+			case P_SEP:
+				break;
+		}
+	}
+	defaults_saved = True;
+}
+
+/*******************************************************************
+ Set the server type we will announce as via nmbd.
+********************************************************************/
+static void set_server_role(void)
+{
+	server_role = ROLE_STANDALONE;
+
+	switch (lp_security())
+	{
+		case SEC_SHARE:
+		{
+			if (lp_domain_logons())
+			{
+				DEBUG(0,
+				      ("Server's Role (logon server) conflicts with share-level security\n"));
+			}
 			break;
-		case P_INTEGER:
-		case P_OCTAL:
-		case P_ENUM:
-			parm_table[i].def.ivalue = *(int *)parm_table[i].ptr;
+		}
+		case SEC_SERVER:
+		case SEC_DOMAIN:
+		{
+			if (lp_domain_logons())
+			{
+				server_role = ROLE_DOMAIN_BDC;
+				break;
+			}
+			server_role = ROLE_DOMAIN_MEMBER;
 			break;
-		case P_SEP:
+		}
+		case SEC_USER:
+		{
+			if (lp_domain_logons())
+			{
+				server_role = ROLE_DOMAIN_PDC;
+				break;
+			}
 			break;
 		}
+		default:
+		{
+			DEBUG(0,
+			      ("Server's Role undefined due to unknown security mode\n"));
+		}
 	}
-	defaults_saved = True;
 }
 
 
@@ -2837,57 +3335,61 @@ static void lp_save_defaults(void)
 Load the services array from the services file. Return True on success, 
 False on failure.
 ***************************************************************************/
-BOOL lp_load(char *pszFname,BOOL global_only, BOOL save_defaults, BOOL add_ipc)
+BOOL lp_load(char *pszFname, BOOL global_only, BOOL save_defaults,
+	     BOOL add_ipc)
 {
-  pstring n2;
-  BOOL bRetval;
+	pstring n2;
+	BOOL bRetval;
 
-  add_to_file_list(pszFname);
+	add_to_file_list(pszFname);
 
-  bRetval = False;
+	bRetval = False;
 
-  bInGlobalSection = True;
-  bGlobalOnly = global_only;
-  
-  init_globals();
+	bInGlobalSection = True;
+	bGlobalOnly = global_only;
 
-  if (save_defaults) {
-	  init_locals();
-	  lp_save_defaults();
-  }
-  
-  pstrcpy(n2,pszFname);
-  standard_sub_basic(n2);
+	init_globals();
 
-  /* We get sections first, so have to start 'behind' to make up */
-  iServiceIndex = -1;
-  bRetval = pm_process(n2, do_section, do_parameter);
-  
-  /* finish up the last section */
-  DEBUG(3,("pm_process() returned %s\n", BOOLSTR(bRetval)));
-  if (bRetval)
-    if (iServiceIndex >= 0)
-      bRetval = service_ok(iServiceIndex);	   
+	if (save_defaults)
+	{
+		init_locals();
+		lp_save_defaults();
+	}
 
-  lp_add_auto_services(lp_auto_services());
+	pstrcpy(n2, pszFname);
+	standard_sub_basic(n2);
 
-  if (add_ipc)
-	  lp_add_ipc();
+	/* We get sections first, so have to start 'behind' to make up */
+	iServiceIndex = -1;
+	bRetval = pm_process(n2, do_section, do_parameter);
 
-  set_default_server_announce_type();
+	/* finish up the last section */
+	DEBUG(3, ("pm_process() returned %s\n", BOOLSTR(bRetval)));
+	if (bRetval)
+		if (iServiceIndex >= 0)
+			bRetval = service_ok(iServiceIndex);
 
-  bLoaded = True;
+	lp_add_auto_services(lp_auto_services());
 
-  /* Now we check bWINSsupport and set szWINSserver to 127.0.0.1 */
-  /* if bWINSsupport is true and we are in the client            */
+	if (add_ipc)
+		lp_add_ipc();
 
-  if (in_client && Globals.bWINSsupport) {
+	set_server_role();
+	set_default_server_announce_type();
 
-    string_set(&Globals.szWINSserver, "127.0.0.1");
+	bLoaded = True;
 
-  }
+	/* Now we check bWINSsupport and set szWINSserver to 127.0.0.1 */
+	/* if bWINSsupport is true and we are in the client            */
 
-  return (bRetval);
+	if (in_client && Globals.bWINSsupport)
+	{
+
+		string_set(&Globals.szWINSserver, "127.0.0.1");
+
+	}
+
+	return (bRetval);
 }
 
 
@@ -2896,7 +3398,7 @@ reset the max number of services
 ***************************************************************************/
 void lp_resetnumservices(void)
 {
-  iNumServices = 0;
+	iNumServices = 0;
 }
 
 /***************************************************************************
@@ -2904,39 +3406,40 @@ return the max number of services
 ***************************************************************************/
 int lp_numservices(void)
 {
-  return(iNumServices);
+	return (iNumServices);
 }
 
 /***************************************************************************
 Display the contents of the services array in human-readable form.
 ***************************************************************************/
-void lp_dump(FILE *f, BOOL show_defaults, int maxtoprint)
+void lp_dump(FILE * f, BOOL show_defaults, int maxtoprint)
 {
-   int iService;
+	int iService;
 
-   if (show_defaults) {
-	   defaults_saved = False;
-   }
+	if (show_defaults)
+	{
+		defaults_saved = False;
+	}
 
-   dump_globals(f);
-   
-   dump_a_service(&sDefault, f);
+	dump_globals(f);
 
-   for (iService = 0; iService < maxtoprint; iService++)
-     lp_dump_one(f, show_defaults, iService);
+	dump_a_service(&sDefault, f);
+
+	for (iService = 0; iService < maxtoprint; iService++)
+		lp_dump_one(f, show_defaults, iService);
 }
 
 /***************************************************************************
 Display the contents of one service in human-readable form.
 ***************************************************************************/
-void lp_dump_one(FILE *f, BOOL show_defaults, int snum)
+void lp_dump_one(FILE * f, BOOL show_defaults, int snum)
 {
-   if (VALID(snum))
-     {
-       if (iSERVICE(snum).szService[0] == '\0')
-	 return;
-       dump_a_service(pSERVICE(snum), f);
-     }
+	if (VALID(snum))
+	{
+		if (iSERVICE(snum).szService[0] == '\0')
+			return;
+		dump_a_service(pSERVICE(snum), f);
+	}
 }
 
 
@@ -2948,17 +3451,19 @@ does not copy the found service.
 ***************************************************************************/
 int lp_servicenumber(char *pszServiceName)
 {
-   int iService;
+	int iService;
 
-   for (iService = iNumServices - 1; iService >= 0; iService--)
-      if (VALID(iService) &&
-	  strequal(lp_servicename(iService), pszServiceName)) 
-         break;
+	for (iService = iNumServices - 1; iService >= 0; iService--)
+		if (VALID(iService) &&
+		    strequal(lp_servicename(iService), pszServiceName))
+			break;
 
-   if (iService < 0)
-     DEBUG(7,("lp_servicenumber: couldn't find %s\n",pszServiceName));
-   
-   return (iService);
+	if (iService < 0)
+		DEBUG(7,
+		      ("lp_servicenumber: couldn't find %s\n",
+		       pszServiceName));
+
+	return (iService);
 }
 
 /*******************************************************************
@@ -2966,9 +3471,10 @@ int lp_servicenumber(char *pszServiceName)
   ******************************************************************/
 char *volume_label(int snum)
 {
-  char *ret = lp_volume(snum);
-  if (!*ret) return(lp_servicename(snum));
-  return(ret);
+	char *ret = lp_volume(snum);
+	if (!*ret)
+		return (lp_servicename(snum));
+	return (ret);
 }
 
 
@@ -2977,20 +3483,113 @@ char *volume_label(int snum)
 ********************************************************************/
 static void set_default_server_announce_type(void)
 {
-  default_server_announce = (SV_TYPE_WORKSTATION | SV_TYPE_SERVER |
-                              SV_TYPE_SERVER_UNIX | SV_TYPE_PRINTQ_SERVER);
-  if(lp_announce_as() == ANNOUNCE_AS_NT_SERVER)
-    default_server_announce |= (SV_TYPE_SERVER_NT | SV_TYPE_NT);
-  if(lp_announce_as() == ANNOUNCE_AS_NT_WORKSTATION)
-    default_server_announce |= SV_TYPE_NT;
-  else if(lp_announce_as() == ANNOUNCE_AS_WIN95)
-    default_server_announce |= SV_TYPE_WIN95_PLUS;
-  else if(lp_announce_as() == ANNOUNCE_AS_WFW)
-    default_server_announce |= SV_TYPE_WFW;
-  default_server_announce |= (lp_time_server() ? SV_TYPE_TIME_SOURCE : 0);
-  default_server_announce |= (lp_host_msdfs() ? SV_TYPE_DFS_SERVER : 0);
+	default_server_announce = 0;
+	default_server_announce |= SV_TYPE_WORKSTATION;
+	default_server_announce |= SV_TYPE_SERVER;
+	default_server_announce |= SV_TYPE_SERVER_UNIX;
+	default_server_announce |= SV_TYPE_PRINTQ_SERVER;
+
+	switch (lp_announce_as())
+	{
+		case ANNOUNCE_AS_NT_SERVER:
+		{
+			default_server_announce |= SV_TYPE_SERVER_NT;
+			/* fall through... */
+		}
+		case ANNOUNCE_AS_NT_WORKSTATION:
+		{
+			default_server_announce |= SV_TYPE_NT;
+			break;
+		}
+		case ANNOUNCE_AS_WIN95:
+		{
+			default_server_announce |= SV_TYPE_WIN95_PLUS;
+			break;
+		}
+		case ANNOUNCE_AS_WFW:
+		{
+			default_server_announce |= SV_TYPE_WFW;
+			break;
+		}
+		default:
+		{
+			break;
+		}
+	}
+
+	switch (lp_server_role())
+	{
+		case ROLE_DOMAIN_MEMBER:
+		{
+			default_server_announce |= SV_TYPE_DOMAIN_MEMBER;
+			break;
+		}
+		case ROLE_DOMAIN_PDC:
+		{
+			default_server_announce |= SV_TYPE_DOMAIN_CTRL;
+			break;
+		}
+		case ROLE_DOMAIN_BDC:
+		{
+			default_server_announce |= SV_TYPE_DOMAIN_BAKCTRL;
+			break;
+		}
+		case ROLE_STANDALONE:
+		default:
+		{
+			break;
+		}
+	}
+
+	if (lp_time_server())
+	{
+		default_server_announce |= SV_TYPE_TIME_SOURCE;
+	}
+
+	if (lp_host_msdfs())
+	{
+		default_server_announce |= SV_TYPE_DFS_SERVER;
+	}
+}
+
+/***********************************************************
+ returns role of Samba server
+************************************************************/
+
+int lp_server_role(void)
+{
+	return server_role;
+}
+
+/***********************************************************
+ If we are PDC then prefer us as DMB
+************************************************************/
+
+BOOL lp_domain_master(void)
+{
+	if (Globals.bDomainMaster == Auto)
+	{
+		return (lp_server_role() == ROLE_DOMAIN_PDC);
+	}
+
+	return Globals.bDomainMaster;
 }
 
+/***********************************************************
+ If we are DMB then prefer us as LMB
+************************************************************/
+
+BOOL lp_preferred_master(void)
+{
+	if (Globals.bPreferredMaster == Auto)
+	{
+		return (lp_local_master() && lp_domain_master());
+	}
+
+	return Globals.bPreferredMaster;
+}
+
+
 
 /*******************************************************************
 remove a service
@@ -3007,7 +3606,8 @@ void lp_copy_service(int snum, char *new_name)
 {
 	char *oldname = lp_servicename(snum);
 	do_section(new_name);
-	if (snum >= 0) {
+	if (snum >= 0)
+	{
 		snum = lp_servicenumber(new_name);
 		if (snum >= 0)
 			lp_do_parameter(snum, "copy", oldname);
@@ -3020,7 +3620,7 @@ void lp_copy_service(int snum, char *new_name)
 ********************************************************************/
 int lp_default_server_announce(void)
 {
-  return default_server_announce;
+	return default_server_announce;
 }
 
 /*******************************************************************
@@ -3028,55 +3628,55 @@ int lp_default_server_announce(void)
 ********************************************************************/
 int lp_major_announce_version(void)
 {
-  static BOOL got_major = False;
-  static int major_version = DEFAULT_MAJOR_VERSION;
-  char *vers;
-  char *p;
+	static BOOL got_major = False;
+	static int major_version = DEFAULT_MAJOR_VERSION;
+	char *vers;
+	char *p;
+
+	if (got_major)
+		return major_version;
 
-  if(got_major)
-    return major_version;
+	got_major = True;
+	if ((vers = lp_announce_version()) == NULL)
+		return major_version;
 
-  got_major = True;
-  if((vers = lp_announce_version()) == NULL)
-    return major_version;
-  
-  if((p = strchr(vers, '.')) == 0)
-    return major_version;
+	if ((p = strchr(vers, '.')) == 0)
+		return major_version;
 
-  *p = '\0';
-  major_version = atoi(vers);
-  return major_version;
+	*p = '\0';
+	major_version = atoi(vers);
+	return major_version;
 }
 
 int lp_minor_announce_version(void)
 {
-  static BOOL got_minor = False;
-  static int minor_version = DEFAULT_MINOR_VERSION;
-  char *vers;
-  char *p;
-
-  if(got_minor)
-    return minor_version;
-
-  got_minor = True;
-  if((vers = lp_announce_version()) == NULL)
-    return minor_version;
-  
-  if((p = strchr(vers, '.')) == 0)              
-    return minor_version;
-    
-  p++;
-  minor_version = atoi(p);
-  return minor_version;
-}  
+	static BOOL got_minor = False;
+	static int minor_version = DEFAULT_MINOR_VERSION;
+	char *vers;
+	char *p;
+
+	if (got_minor)
+		return minor_version;
+
+	got_minor = True;
+	if ((vers = lp_announce_version()) == NULL)
+		return minor_version;
+
+	if ((p = strchr(vers, '.')) == 0)
+		return minor_version;
+
+	p++;
+	minor_version = atoi(p);
+	return minor_version;
+}
 
 /***********************************************************
  Set the global name resolution order (used in smbclient).
 ************************************************************/
 
 void lp_set_name_resolve_order(char *new_order)
-{ 
-  Globals.szNameResolveOrder = new_order;
+{
+	Globals.szNameResolveOrder = new_order;
 }
 
 /***********************************************************
@@ -3088,16 +3688,16 @@ static BOOL kernel_oplocks_available = False;
 
 void lp_set_kernel_oplocks(BOOL val)
 {
-  /*
-   * Only set this to True if kerenl
-   * oplocks are really available and were
-   * turned on in the smb.conf file.
-   */
+	/*
+	 * Only set this to True if kerenl
+	 * oplocks are really available and were
+	 * turned on in the smb.conf file.
+	 */
 
-  if(Globals.bKernelOplocks && val)
-    kernel_oplocks_available = True;
-  else
-    kernel_oplocks_available = False;
+	if (Globals.bKernelOplocks && val)
+		kernel_oplocks_available = True;
+	else
+		kernel_oplocks_available = False;
 }
 
 /***********************************************************
@@ -3107,7 +3707,7 @@ void lp_set_kernel_oplocks(BOOL val)
 
 BOOL lp_kernel_oplocks(void)
 {
-  return kernel_oplocks_available;
+	return kernel_oplocks_available;
 }
 
 /***********************************************************
@@ -3117,34 +3717,33 @@ BOOL lp_kernel_oplocks(void)
 
 int lp_security_mask(int snum)
 {
-  int val = _lp_security_mask(snum);
-  if(val == -1)
-    return lp_create_mask(snum);
-  return val;
+	int val = _lp_security_mask(snum);
+	if (val == -1)
+		return lp_create_mask(snum);
+	return val;
 }
 
 int lp_force_security_mode(int snum)
 {
-  int val = _lp_force_security_mode(snum);
-  if(val == -1)
-    return lp_force_create_mode(snum);
-  return val;
+	int val = _lp_force_security_mode(snum);
+	if (val == -1)
+		return lp_force_create_mode(snum);
+	return val;
 }
 
 int lp_dir_security_mask(int snum)
 {
-  int val = _lp_dir_security_mask(snum);
-  if(val == -1)
-    return lp_dir_mask(snum);
-  return val;
+	int val = _lp_dir_security_mask(snum);
+	if (val == -1)
+		return lp_dir_mask(snum);
+	return val;
 }
 
 int lp_force_dir_security_mode(int snum)
 {
-  int val = _lp_force_dir_security_mode(snum);
-  if(val == -1)
-    return lp_force_dir_mode(snum);
-  return val;
+	int val = _lp_force_dir_security_mode(snum);
+	if (val == -1)
+		return lp_force_dir_mode(snum);
+	return val;
 }
 
-
diff --git a/source3/rpc_server/srv_reg.c b/source3/rpc_server/srv_reg.c
index ea7f3ecd5d..ca3911121f 100644
--- a/source3/rpc_server/srv_reg.c
+++ b/source3/rpc_server/srv_reg.c
@@ -186,7 +186,7 @@ static void reg_reply_info(REG_Q_INFO *q_u,
 				prs_struct *rdata)
 {
 	uint32 status     = 0;
-	fstring key = "ServerNT"; /* always a non-PDC */
+	char *key;
 	uint32 type=0x1; /* key type: REG_SZ */
 
 	UNISTR2 uni_key;
@@ -201,6 +201,25 @@ static void reg_reply_info(REG_Q_INFO *q_u,
 		status = NT_STATUS_INVALID_HANDLE;
 	}
 
+	switch (lp_server_role())
+	{
+		case ROLE_DOMAIN_PDC:
+		case ROLE_DOMAIN_BDC:
+		{
+			key = "LanmanNT";
+			break;
+		}
+		case ROLE_STANDALONE:
+		{
+			key = "ServerNT";
+			break;
+		}
+		case ROLE_DOMAIN_MEMBER:
+		{
+			key = "WinNT";
+			break;
+		}
+	}
 	/* This makes the server look like a member server to clients */
 	/* which tells clients that we have our own local user and    */
 	/* group databases and helps with ACL support.                */