Author: vlendec Date: 2006-08-27 17:24:31 +0000 (Sun, 27 Aug 2006) New Revision: 17854
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17854 Log: Steal the LDAP in NTSTATUS trick from Samba4 Thanks to Michael Adam <[EMAIL PROTECTED]> Volker Modified: branches/SAMBA_3_0/source/Makefile.in branches/SAMBA_3_0/source/include/nt_status.h branches/SAMBA_3_0/source/libads/ads_status.c branches/SAMBA_3_0/source/libsmb/nterr.c Changeset: Modified: branches/SAMBA_3_0/source/Makefile.in =================================================================== --- branches/SAMBA_3_0/source/Makefile.in 2006-08-27 16:50:10 UTC (rev 17853) +++ branches/SAMBA_3_0/source/Makefile.in 2006-08-27 17:24:31 UTC (rev 17854) @@ -960,7 +960,7 @@ bin/[EMAIL PROTECTED]@: $(PROFILES_OBJ) @BUILD_POPT@ bin/.dummy @echo Linking $@ - @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(PROFILES_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ + @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(PROFILES_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) $(LDAP_LIBS) @POPTLIBS@ bin/[EMAIL PROTECTED]@: $(CUPS_OBJ) bin/.dummy @echo Linking $@ @@ -988,18 +988,18 @@ bin/[EMAIL PROTECTED]@: $(TESTPARM_OBJ) @BUILD_POPT@ bin/.dummy @echo Linking $@ - @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(TESTPARM_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) @POPTLIBS@ + @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(TESTPARM_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(LDAP_LIBS) @POPTLIBS@ bin/[EMAIL PROTECTED]@: $(STATUS_OBJ) @BUILD_POPT@ bin/.dummy @echo Linking $@ - @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(STATUS_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \ + @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(STATUS_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(LDAP_LIBS) \ @POPTLIBS@ bin/[EMAIL PROTECTED]@: $(SMBCONTROL_OBJ) @BUILD_POPT@ bin/.dummy @echo Linking $@ @$(CC) -DUSING_SMBCONTROL $(FLAGS) @PIE_LDFLAGS@ -o $@ \ $(SMBCONTROL_OBJ) $(DYNEXP) $(LDFLAGS) \ - $(LIBS) @LIBUNWIND_PTRACE@ @POPTLIBS@ + $(LIBS) $(LDAP_LIBS) @LIBUNWIND_PTRACE@ @POPTLIBS@ bin/[EMAIL PROTECTED]@: $(SMBTREE_OBJ) @BUILD_POPT@ bin/.dummy @echo Linking $@ @@ -1032,7 +1032,8 @@ bin/[EMAIL PROTECTED]@: $(TALLOCTORT_OBJ) bin/.dummy @echo Linking $@ - @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(TALLOCTORT_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) + @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(TALLOCTORT_OBJ) $(LDFLAGS) \ + $(DYNEXP) $(LIBS) $(LDAP_LIBS) bin/[EMAIL PROTECTED]@: $(MASKTEST_OBJ) bin/.dummy @echo Linking $@ @@ -1052,11 +1053,11 @@ bin/[EMAIL PROTECTED]@: $(EVTLOGADM_OBJ) @BUILD_POPT@ bin/.dummy @echo Linking $@ - @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(EVTLOGADM_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ + @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(EVTLOGADM_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) $(LDAP_LIBS) @POPTLIBS@ bin/[EMAIL PROTECTED]@: $(SHARESEC_OBJ) @BUILD_POPT@ bin/.dummy @echo Linking $@ - @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SHARESEC_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ + @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SHARESEC_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) $(LDAP_LIBS) @POPTLIBS@ bin/[EMAIL PROTECTED]@: $(LOCKTEST_OBJ) bin/.dummy @echo Linking $@ @@ -1438,7 +1439,7 @@ bin/[EMAIL PROTECTED]@: $(WBINFO_OBJ) @BUILD_POPT@ bin/.dummy @echo Linking $@ - @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDFLAGS) $(WBINFO_OBJ) $(DYNEXP) $(LIBS) @POPTLIBS@ + @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDFLAGS) $(WBINFO_OBJ) $(DYNEXP) $(LIBS) $(LDAP_LIBS) @POPTLIBS@ bin/[EMAIL PROTECTED]@: $(NTLM_AUTH_OBJ) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \ @BUILD_POPT@ bin/.dummy Modified: branches/SAMBA_3_0/source/include/nt_status.h =================================================================== --- branches/SAMBA_3_0/source/include/nt_status.h 2006-08-27 16:50:10 UTC (rev 17853) +++ branches/SAMBA_3_0/source/include/nt_status.h 2006-08-27 17:24:31 UTC (rev 17854) @@ -66,12 +66,34 @@ }\ } while (0) + +/* The top byte in an NTSTATUS code is used as a type field. + * Windows only uses value 0xC0 as an indicator for an NT error + * and 0x00 for success. + * So we can use the type field to store other types of error codes + * inside the three lower bytes. + * NB: The system error codes (errno) are not integrated via a type of + * their own but are mapped to genuine NT error codes via + * map_nt_error_from_unix() */ + +#define NT_STATUS_TYPE(status) ((NT_STATUS_V(status) & 0xFF000000) >> 24) + +#define NT_STATUS_TYPE_DOS 0xF1 +#define NT_STATUS_TYPE_LDAP 0xF2 + /* this defines special NTSTATUS codes to represent DOS errors. I have chosen this macro to produce status codes in the invalid NTSTATUS range */ -#define NT_STATUS_DOS(class, code) NT_STATUS(0xF1000000 | ((class)<<16) | code) -#define NT_STATUS_IS_DOS(status) ((NT_STATUS_V(status) & 0xFF000000) == 0xF1000000) +#define NT_STATUS_DOS_MASK (NT_STATUS_TYPE_DOS << 24) +#define NT_STATUS_DOS(class, code) NT_STATUS(NT_STATUS_DOS_MASK | ((class)<<16) | code) +#define NT_STATUS_IS_DOS(status) ((NT_STATUS_V(status) & 0xFF000000) == NT_STATUS_DOS_MASK) #define NT_STATUS_DOS_CLASS(status) ((NT_STATUS_V(status) >> 16) & 0xFF) #define NT_STATUS_DOS_CODE(status) (NT_STATUS_V(status) & 0xFFFF) +/* define ldap error codes as NTSTATUS codes */ +#define NT_STATUS_LDAP_MASK (NT_STATUS_TYPE_LDAP << 24) +#define NT_STATUS_LDAP(code) NT_STATUS(NT_STATUS_LDAP_MASK | code) +#define NT_STATUS_IS_LDAP(status) ((NT_STATUS_V(status) & 0xFF000000) == NT_STATUS_LDAP_MASK) +#define NT_STATUS_LDAP_CODE(status) (NT_STATUS_V(status) & ~0xFF000000) + #endif Modified: branches/SAMBA_3_0/source/libads/ads_status.c =================================================================== --- branches/SAMBA_3_0/source/libads/ads_status.c 2006-08-27 16:50:10 UTC (rev 17853) +++ branches/SAMBA_3_0/source/libads/ads_status.c 2006-08-27 17:24:31 UTC (rev 17854) @@ -76,10 +76,7 @@ return map_nt_error_from_unix(status.err.rc); #ifdef HAVE_LDAP case ENUM_ADS_ERROR_LDAP: - if (status.err.rc == LDAP_NO_MEMORY) { - return NT_STATUS_NO_MEMORY; - } - break; + return NT_STATUS_LDAP(status.err.rc); #endif #ifdef HAVE_KRB5 case ENUM_ADS_ERROR_KRB5: Modified: branches/SAMBA_3_0/source/libsmb/nterr.c =================================================================== --- branches/SAMBA_3_0/source/libsmb/nterr.c 2006-08-27 16:50:10 UTC (rev 17853) +++ branches/SAMBA_3_0/source/libsmb/nterr.c 2006-08-27 17:24:31 UTC (rev 17854) @@ -650,11 +650,14 @@ static pstring msg; int idx = 0; + if (NT_STATUS_TYPE(nt_code) == NT_STATUS_TYPE_LDAP) { + return ldap_err2string(NT_STATUS_LDAP_CODE(nt_code)); + } + slprintf(msg, sizeof(msg), "NT code 0x%08x", NT_STATUS_V(nt_code)); while (nt_errs[idx].nt_errstr != NULL) { - if (NT_STATUS_V(nt_errs[idx].nt_errcode) == - NT_STATUS_V(nt_code)) { + if (NT_STATUS_EQUAL(nt_errs[idx].nt_errcode, nt_code)) { return nt_errs[idx].nt_errstr; } idx++;
