diff options
Diffstat (limited to 'source3/libads')
| -rw-r--r-- | source3/libads/ads_status.c | 13 | ||||
| -rw-r--r-- | source3/libads/ldap_utils.c | 34 |
2 files changed, 17 insertions, 30 deletions
diff --git a/source3/libads/ads_status.c b/source3/libads/ads_status.c index 742304b6fc..3f0ab57638 100644 --- a/source3/libads/ads_status.c +++ b/source3/libads/ads_status.c @@ -84,10 +84,6 @@ NTSTATUS ads_ntstatus(ADS_STATUS status) case ENUM_ADS_ERROR_KRB5: return krb5_to_nt_status(status.err.rc); #endif -#ifdef HAVE_GSSAPI - case ENUM_ADS_ERROR_GSS: - return map_nt_error_from_gss(status.err.rc, status.minor_status); -#endif default: break; } @@ -146,12 +142,3 @@ const char *ads_errstr(ADS_STATUS status) } } -#ifdef HAVE_GSSAPI -NTSTATUS gss_err_to_ntstatus(uint32 maj, uint32 min) -{ - ADS_STATUS adss = ADS_ERROR_GSS(maj, min); - DEBUG(10,("gss_err_to_ntstatus: Error %s\n", - ads_errstr(adss) )); - return ads_ntstatus(adss); -} -#endif diff --git a/source3/libads/ldap_utils.c b/source3/libads/ldap_utils.c index 2f5c11b90c..18f7da81d7 100644 --- a/source3/libads/ldap_utils.c +++ b/source3/libads/ldap_utils.c @@ -60,8 +60,8 @@ static ADS_STATUS ads_do_search_retry_internal(ADS_STRUCT *ads, const char *bind status = ads_do_search_all_args(ads, bp, scope, expr, attrs, args, res); } if (ADS_ERR_OK(status)) { - DEBUG(5,("Search for %s in <%s> gave %d replies\n", - expr, bp, ads_count_replies(ads, *res))); + DEBUG(5,("Search for %s in <%s> gave %d replies\n", + expr, bp, ads_count_replies(ads, *res))); SAFE_FREE(bp); return status; } @@ -159,6 +159,21 @@ static ADS_STATUS ads_do_search_retry_internal(ADS_STRUCT *ads, const char *bind "(objectclass=*)", attrs, &args, res); } + ADS_STATUS ads_search_retry_dn_sd_flags(ADS_STRUCT *ads, LDAPMessage **res, + uint32 sd_flags, + const char *dn, + const char **attrs) +{ + ads_control args; + + args.control = ADS_SD_FLAGS_OID; + args.val = sd_flags; + args.critical = True; + + return ads_do_search_retry_args(ads, dn, LDAP_SCOPE_BASE, + "(objectclass=*)", attrs, &args, res); +} + ADS_STATUS ads_search_retry_extended_dn_ranged(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, const char *dn, const char **attrs, @@ -183,21 +198,6 @@ static ADS_STATUS ads_do_search_retry_internal(ADS_STRUCT *ads, const char *bind } - ADS_STATUS ads_search_retry_dn_sd_flags(ADS_STRUCT *ads, LDAPMessage **res, - uint32 sd_flags, - const char *dn, - const char **attrs) -{ - ads_control args; - - args.control = ADS_SD_FLAGS_OID; - args.val = sd_flags; - args.critical = True; - - return ads_do_search_retry_args(ads, dn, LDAP_SCOPE_BASE, - "(objectclass=*)", attrs, &args, res); -} - ADS_STATUS ads_search_retry_sid(ADS_STRUCT *ads, LDAPMessage **res, const DOM_SID *sid, const char **attrs) |