diff options
| author | Günther Deschner <gd@samba.org> | 2010-05-31 12:51:58 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-07-01 23:20:39 +0200 |
| commit | e64df82146cf62ae6e13b8e4c1adcc8b49b2fd6d (patch) | |
| tree | f7c0446cc926163f53721cb9fc4e7bdba3c16864 /source3/include/ads.h | |
| parent | 6b25d47fea231fad2009a1e0971ccfa1acf68176 (diff) | |
| download | samba-e64df82146cf62ae6e13b8e4c1adcc8b49b2fd6d.tar.gz samba-e64df82146cf62ae6e13b8e4c1adcc8b49b2fd6d.tar.bz2 samba-e64df82146cf62ae6e13b8e4c1adcc8b49b2fd6d.zip | |
s3-libads: move ads_status to a separate header file.
Guenther
Diffstat (limited to 'source3/include/ads.h')
| -rw-r--r-- | source3/include/ads.h | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/source3/include/ads.h b/source3/include/ads.h index 132586fe31..e48e0a2650 100644 --- a/source3/include/ads.h +++ b/source3/include/ads.h @@ -41,21 +41,6 @@ enum wb_posix_mapping { WB_POSIX_MAP_UNIXINFO = 4 }; -/* there are 5 possible types of errors the ads subsystem can produce */ -enum ads_error_type {ENUM_ADS_ERROR_KRB5, ENUM_ADS_ERROR_GSS, - ENUM_ADS_ERROR_LDAP, ENUM_ADS_ERROR_SYSTEM, ENUM_ADS_ERROR_NT}; - -typedef struct { - enum ads_error_type error_type; - union err_state{ - int rc; - NTSTATUS nt_status; - } err; - /* For error_type = ENUM_ADS_ERROR_GSS minor_status describe GSS API error */ - /* Where rc represents major_status of GSS API error */ - int minor_status; -} ADS_STATUS; - struct ads_struct; struct ads_saslwrap_ops { @@ -169,24 +154,6 @@ typedef LDAPMod **ADS_MODLIST; typedef void **ADS_MODLIST; #endif -/* macros to simplify error returning */ -#define ADS_ERROR(rc) ADS_ERROR_LDAP(rc) -#define ADS_ERROR_LDAP(rc) ads_build_error(ENUM_ADS_ERROR_LDAP, rc, 0) -#define ADS_ERROR_SYSTEM(rc) ads_build_error(ENUM_ADS_ERROR_SYSTEM, rc?rc:EINVAL, 0) -#define ADS_ERROR_KRB5(rc) ads_build_error(ENUM_ADS_ERROR_KRB5, rc, 0) -#define ADS_ERROR_GSS(rc, minor) ads_build_error(ENUM_ADS_ERROR_GSS, rc, minor) -#define ADS_ERROR_NT(rc) ads_build_nt_error(ENUM_ADS_ERROR_NT,rc) - -#define ADS_ERR_OK(status) ((status.error_type == ENUM_ADS_ERROR_NT) ? NT_STATUS_IS_OK(status.err.nt_status):(status.err.rc == 0)) -#define ADS_SUCCESS ADS_ERROR(0) - -#define ADS_ERROR_HAVE_NO_MEMORY(x) do { \ - if (!(x)) {\ - return ADS_ERROR(LDAP_NO_MEMORY);\ - }\ -} while (0) - - /* time between reconnect attempts */ #define ADS_RECONNECT_TIME 5 |