s3-param use lp_parm_ptr() rather than parm.ptr directly

[ddiss/samba.git] / source3 / include / smb.h

diff --git a/source3/include/smb.h b/source3/include/smb.h
index 28bc49f85849635a2688900d21c3bf4c0d5efb8f..f46a58ef11829fed1081beb5a58d8d0277731f66 100644 (file)
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -397,10 +397,6 @@ struct share_params {
        int service;
 };
 
-struct share_iterator {
-       int next_id;
-};
-
 typedef struct connection_struct {
        struct connection_struct *next, *prev;
        struct smbd_server_connection *sconn; /* can be NULL */
@@ -729,6 +725,8 @@ struct enum_list {
        const char *name;
 };
 
+struct loadparm_service;
+
 struct parm_struct {
        const char *label;
        parm_type type;
@@ -1240,8 +1238,8 @@ char *strdup(char *s);
  *        This may change again in Samba-3.0 after further testing. JHT
  */
  
-#define DEFAULT_MAJOR_VERSION 0x04
-#define DEFAULT_MINOR_VERSION 0x09
+#define SAMBA_MAJOR_NBT_ANNOUNCE_VERSION 0x04
+#define SAMBA_MINOR_NBT_ANNOUNCE_VERSION 0x09
 
 /* Browser Election Values */
 #define BROWSER_ELECTION_VERSION       0x010f
@@ -1296,9 +1294,6 @@ enum protocol_types {
        PROTOCOL_SMB2
 };
 
-/* security levels */
-enum security_types {SEC_SHARE,SEC_USER,SEC_SERVER,SEC_DOMAIN,SEC_ADS};
-
 /* printing types */
 enum printing_types {PRINT_BSD,PRINT_SYSV,PRINT_AIX,PRINT_HPUX,
                     PRINT_QNX,PRINT_PLP,PRINT_LPRNG,PRINT_SOFTQ,
@@ -1549,13 +1544,6 @@ typedef struct user_struct {
        struct auth_ntlmssp_state *auth_ntlmssp_state;
 } user_struct;
 
-struct unix_error_map {
-       int unix_error;
-       int dos_class;
-       int dos_code;
-       NTSTATUS nt_error;
-};
-
 /*
    Do you want session setups at user level security with a invalid
    password to be rejected or allowed in as guest? WinNT rejects them