Changeset 124 for branches/samba-3.0/source/include

Timestamp:

Mar 12, 2008, 9:08:18 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.28a

Location:

branches/samba-3.0/source/include

Files:

• ads.h (modified) (1 diff)
• config.h.in (modified) (6 diffs)
• includes.h (modified) (1 diff)
• rpc_dce.h (modified) (1 diff)
• rpc_samr.h (modified) (2 diffs)
• smb.h (modified) (3 diffs)
• version.h (modified) (1 diff)

branches/samba-3.0/source/include/ads.h

@@ -322 +322 @@
         int critical;
 } ads_control;
+
+#define ADS_IGNORE_PRINCIPAL "not_defined_in_RFC4178@please_ignore"
+
 #endif  /* _INCLUDE_ADS_H_ */

branches/samba-3.0/source/include/config.h.in

@@ -686 +686 @@
 #undef HAVE_INOTIFY
 
+/* Define to 1 if you have the `inotify_init' function. */
+#undef HAVE_INOTIFY_INIT
+
 /* Whether int16 typedef is included by rpc/rpc.h */
 #undef HAVE_INT16_FROM_RPC_RPC_H
@@ -843 +846 @@
 #undef HAVE_KRB5_PRINCIPAL_GET_COMP_STRING
 
+/* Whether the function krb5_principal_get_realm is defined */
+#undef HAVE_KRB5_PRINCIPAL_GET_REALM
+
 /* Whether krb5_princ_component is available */
 #undef HAVE_KRB5_PRINC_COMPONENT
 
+/* Whether the macro krb5_princ_realm is defined */
+#undef HAVE_KRB5_PRINC_REALM
+
 /* Define to 1 if you have the `krb5_princ_size' function. */
 #undef HAVE_KRB5_PRINC_SIZE
@@ -890 +899 @@
 /* Define to 1 if you have the <lber.h> header file. */
 #undef HAVE_LBER_H
+
+/* Support for LDAP/LBER logging interception */
+#undef HAVE_LBER_LOG_PRINT_FN
 
 /* Whether ldap is available */
@@ -1572 +1584 @@
 #undef HAVE_STRNLEN
 
+/* Define to 1 if you have the <stropts.h> header file. */
+#undef HAVE_STROPTS_H
+
 /* Define to 1 if you have the `strpbrk' function. */
 #undef HAVE_STRPBRK
@@ -2279 +2294 @@
 /* Whether getpass should be replaced */
 #undef REPLACE_GETPASS
+
+/* getpass returns <9 chars where getpassphrase returns <265 chars */
+#undef REPLACE_GETPASS_BY_GETPASSPHRASE
 
 /* Whether inet_ntoa should be replaced */
@@ -2826 +2844 @@
 #undef vfs_netatalk_init
 
+/* Whether to build vfs_notify_fam as shared module */
+#undef vfs_notify_fam_init
+
 /* Whether to build vfs_posixacl as shared module */
 #undef vfs_posixacl_init

branches/samba-3.0/source/include/includes.h

@@ -108 +108 @@
 #include "system/network.h"
 #include "system/passwd.h"
-#include "system/printing.h"
 #include "system/readline.h"
 #include "system/select.h"

branches/samba-3.0/source/include/rpc_dce.h

@@ -113 +113 @@
 #define NETLOGON_NEG_AUTH2_ADS_FLAGS (0x200fbffb | NETLOGON_NEG_ARCFOUR | NETLOGON_NEG_128BIT | NETLOGON_NEG_SCHANNEL)
 
+#define NETLOGON_NEG_SELECT_AUTH2_FLAGS ((lp_security() == SEC_ADS) ? NETLOGON_NEG_AUTH2_ADS_FLAGS : NETLOGON_NEG_AUTH2_FLAGS)
+
 enum schannel_direction {
         SENDER_IS_INITIATOR,

branches/samba-3.0/source/include/rpc_samr.h

@@ -147 +147 @@
 #define SAMR_CONNECT5          0x40
 
+/* SAMR account creation flags/permissions */
+#define SAMR_USER_GETNAME               0x1
+#define SAMR_USER_GETLOCALE             0x2
+#define SAMR_USER_GETLOCCOM             0x4
+#define SAMR_USER_GETLOGONINFO          0x8
+#define SAMR_USER_GETATTR               0x10
+#define SAMR_USER_SETATTR               0x20
+#define SAMR_USER_CHPASS                0x40
+#define SAMR_USER_SETPASS               0x80
+#define SAMR_USER_GETGROUPS             0x100
+#define SAMR_USER_GETMEMBERSHIP         0x200
+#define SAMR_USER_CHMEMBERSHIP          0x400
+#define SAMR_STANDARD_DELETE            0x10000
+#define SAMR_STANDARD_READCTRL          0x20000
+#define SAMR_STANDARD_WRITEDAC          0x40000
+#define SAMR_STANDARD_WRITEOWNER        0x80000
+#define SAMR_STANDARD_SYNC              0x100000
+#define SAMR_GENERIC_ACCESSSACL         0x800000
+#define SAMR_GENERIC_MAXALLOWED         0x2000000
+#define SAMR_GENERIC_ALL                0x10000000
+#define SAMR_GENERIC_EXECUTE            0x20000000
+#define SAMR_GENERIC_WRITE              0x40000000
+#define SAMR_GENERIC_READ               0x80000000
+
+
 typedef struct logon_hours_info
 {
@@ -1558 +1583 @@
 
         uint32 acb_info;      /* account control info */
-        uint32 access_mask;     /* 0xe005 00b0 */
+        uint32 acct_flags;     /* 0xe005 00b0 */
 
 } SAMR_Q_CREATE_USER;

branches/samba-3.0/source/include/smb.h

@@ -29 +29 @@
 
 /* logged when starting the various Samba daemons */
-#define COPYRIGHT_STARTUP_MESSAGE       "Copyright Andrew Tridgell and the Samba Team 1992-2007"
+#define COPYRIGHT_STARTUP_MESSAGE       "Copyright Andrew Tridgell and the Samba Team 1992-2008"
 
 
@@ -258 +258 @@
 };
 
-#define LOOKUP_NAME_ISOLATED 1  /* Look up unqualified names */
-#define LOOKUP_NAME_REMOTE   2  /* Ask others */
-#define LOOKUP_NAME_ALL (LOOKUP_NAME_ISOLATED|LOOKUP_NAME_REMOTE)
-
-#define LOOKUP_NAME_GROUP    4  /* (unused) This is a NASTY hack for valid users = @foo
-                                 * where foo also exists in as user. */
+
+#define LOOKUP_NAME_NONE                0x00000000
+#define LOOKUP_NAME_ISOLATED            0x00000001  /* Look up unqualified names */
+#define LOOKUP_NAME_REMOTE              0x00000002  /* Ask others */
+#define LOOKUP_NAME_GROUP               0x00000004  /* (unused) This is a NASTY hack for
+                                                        valid users = @foo where foo also
+                                                        exists in as user. */
+#define LOOKUP_NAME_EXPLICIT            0x00000008  /* Only include
+                                                        explicitly mapped names and not
+                                                        the Unix {User,Group} domain */
+#define LOOKUP_NAME_BUILTIN             0x00000010 /* builtin names */
+#define LOOKUP_NAME_WKN                 0x00000020 /* well known names */
+#define LOOKUP_NAME_DOMAIN              0x00000040 /* only lookup own domain */
+#define LOOKUP_NAME_LOCAL               (LOOKUP_NAME_ISOLATED\
+                                        |LOOKUP_NAME_BUILTIN\
+                                        |LOOKUP_NAME_WKN\
+                                        |LOOKUP_NAME_DOMAIN)
+#define LOOKUP_NAME_ALL                 (LOOKUP_NAME_ISOLATED\
+                                        |LOOKUP_NAME_REMOTE\
+                                        |LOOKUP_NAME_BUILTIN\
+                                        |LOOKUP_NAME_WKN\
+                                        |LOOKUP_NAME_DOMAIN)
 
 /**
@@ -1919 +1935 @@
 enum file_close_type {NORMAL_CLOSE=0,SHUTDOWN_CLOSE,ERROR_CLOSE};
 
+/* Used in SMB_FS_OBJECTID_INFORMATION requests.  Must be exactly 48 bytes. */
+#define SAMBA_EXTENDED_INFO_MAGIC 0x536d4261 /* "SmBa" */
+#define SAMBA_EXTENDED_INFO_VERSION_STRING_LENGTH 28
+struct smb_extended_info {
+        uint32 samba_magic;             /* Always SAMBA_EXTRA_INFO_MAGIC */
+        uint32 samba_version;           /* Major/Minor/Release/Revision */
+        uint32 samba_subversion;        /* Prerelease/RC/Vendor patch */
+        NTTIME samba_gitcommitdate;
+        char   samba_version_string[SAMBA_EXTENDED_INFO_VERSION_STRING_LENGTH];
+};
+
 #endif /* _SMB_H */

branches/samba-3.0/source/include/version.h

@@ -3 +3 @@
 #define SAMBA_VERSION_MINOR 0
 #define SAMBA_VERSION_RELEASE 28
-#define SAMBA_VERSION_OFFICIAL_STRING "3.0.28"
+#define SAMBA_VERSION_REVISION "a"
+#define SAMBA_VERSION_OFFICIAL_STRING "3.0.28a"
 #define SAMBA_VERSION_STRING samba_version_string()