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

Timestamp:

May 23, 2008, 6:56:41 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.29

Location:

branches/samba-3.0/source/include

Files:

• MacExtensions.h (modified) (1 diff)
• ads_protos.h (modified) (1 diff)
• nt_status.h (modified) (2 diffs)
• nterr.h (modified) (1 diff)
• rpc_dce.h (modified) (1 diff)
• rpc_samr.h (modified) (1 diff)
• rpc_spoolss.h (modified) (2 diffs)
• version.h (modified) (1 diff)

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

@@ -237 +237 @@
 **              
 **
-** The server returns only that the call was succesfull or not. 
+** The server returns only that the call was successful or not.
 */
 #define SMB_MAC_DT_ADD_ICON       0x309

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

@@ -84 +84 @@
 LDAPMessage *ads_first_entry(ADS_STRUCT *ads, LDAPMessage *res);
 LDAPMessage *ads_next_entry(ADS_STRUCT *ads, LDAPMessage *res);
+LDAPMessage *ads_first_message(ADS_STRUCT *ads, LDAPMessage *res);
+LDAPMessage *ads_next_message(ADS_STRUCT *ads, LDAPMessage *res);
 void ads_process_results(ADS_STRUCT *ads, LDAPMessage *res,
                          BOOL(*fn)(char *, void **, void *),

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

@@ -35 +35 @@
 */
 
-#if defined(HAVE_IMMEDIATE_STRUCTURES)
+#if defined(HAVE_IMMEDIATE_STRUCTURES) && !defined(__OS2__)
 typedef struct {uint32 v;} NTSTATUS;
 #define NT_STATUS(x) ((NTSTATUS) { x })
@@ -45 +45 @@
 #endif
 
-#if defined(HAVE_IMMEDIATE_STRUCTURES)
+#if defined(HAVE_IMMEDIATE_STRUCTURES) && !defined(__OS2__)
 typedef struct {uint32 w;} WERROR;
 #define W_ERROR(x) ((WERROR) { x })

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

@@ -565 +565 @@
 #define NT_STATUS_DS_NO_MORE_RIDS NT_STATUS(0xC0000000 | 0x02a8)
 #define NT_STATUS_NOT_A_REPARSE_POINT NT_STATUS(0xC0000000 | 0x0275)
+#define NT_STATUS_DOWNGRADE_DETECTED NT_STATUS(0xC0000000 | 0x0388)
 #define NT_STATUS_NO_SUCH_JOB NT_STATUS(0xC0000000 | 0xEDE) /* scheduler */
 #define NT_STATUS_RPC_PROTSEQ_NOT_SUPPORTED NT_STATUS(0xC0000000 | 0x20004)

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

@@ -109 +109 @@
 #define NETLOGON_NEG_AUTH2_FLAGS 0x000701ff
 #define NETLOGON_NEG_DOMAIN_TRUST_ACCOUNT       0x2010b000
- 
+
 /* these are the flags that ADS clients use */
-#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)
+#define NETLOGON_NEG_AUTH2_ADS_FLAGS 0x600fffff
 
 enum schannel_direction {

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

@@ -131 +131 @@
 #define SAMR_QUERY_DISPINFO3   0x30 /* Alias for SAMR_QUERY_DISPINFO
                                        with info level 3 */
-#define SAMR_UNKNOWN_31        0x31
+#define SAMR_GET_DISPENUM_INDEX2 0x31
 #define SAMR_CREATE_USER       0x32
 #define SAMR_QUERY_DISPINFO4   0x33 /* Alias for SAMR_QUERY_DISPINFO

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

@@ -166 +166 @@
 #define PRINTER_ACCESS_USE              0x00000008
 #define JOB_ACCESS_ADMINISTER           0x00000010
+#define JOB_ACCESS_READ                 0x00000020
 
 /* JOB status codes. */
@@ -195 +196 @@
 
 /* Access rights for jobs */
-#define JOB_ALL_ACCESS  STANDARD_RIGHTS_REQUIRED_ACCESS|JOB_ACCESS_ADMINISTER
-#define JOB_READ        STANDARD_RIGHTS_READ_ACCESS|JOB_ACCESS_ADMINISTER
-#define JOB_WRITE       STANDARD_RIGHTS_WRITE_ACCESS|JOB_ACCESS_ADMINISTER
-#define JOB_EXECUTE     STANDARD_RIGHTS_EXECUTE_ACCESS|JOB_ACCESS_ADMINISTER
+#define JOB_ALL_ACCESS  STANDARD_RIGHTS_REQUIRED_ACCESS|JOB_ACCESS_ADMINISTER|JOB_ACCESS_READ|PRINTER_ACCESS_USE
+#define JOB_READ        STANDARD_RIGHTS_READ_ACCESS|JOB_ACCESS_ADMINISTER|JOB_ACCESS_READ
+#define JOB_WRITE       STANDARD_RIGHTS_WRITE_ACCESS|JOB_ACCESS_ADMINISTER|PRINTER_ACCESS_USE
+#define JOB_EXECUTE     STANDARD_RIGHTS_EXECUTE_ACCESS|JOB_ACCESS_ADMINISTER|PRINTER_ACCESS_USE
 
 /* ACE masks for the various print permissions */

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

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