diff options
| -rw-r--r-- | source4/include/ads.h | 71 | ||||
| -rw-r--r-- | source4/include/includes.h | 4 | ||||
| -rw-r--r-- | source4/lib/debug.h (renamed from source4/include/debug.h) | 0 | ||||
| -rw-r--r-- | source4/libcli/rap/rap.h (renamed from source4/include/rap.h) | 0 | ||||
| -rw-r--r-- | source4/libcli/util/doserr.h (renamed from source4/include/doserr.h) | 0 | ||||
| -rw-r--r-- | source4/libcli/util/nterr.h (renamed from source4/include/nterr.h) | 0 | ||||
| -rw-r--r-- | source4/ntvfs/ipc/ipc_rap.c | 2 | ||||
| -rw-r--r-- | source4/ntvfs/ipc/rap_server.c | 2 | ||||
| -rw-r--r-- | source4/torture/rap/rap.c | 2 |
9 files changed, 5 insertions, 76 deletions
diff --git a/source4/include/ads.h b/source4/include/ads.h index f01302a597..46377fecd0 100644 --- a/source4/include/ads.h +++ b/source4/include/ads.h @@ -19,77 +19,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - -typedef struct ads_struct { - void *ld; /* the active ldap structure */ - struct ipv4_addr ldap_ip; /* the ip of the active connection, if any */ - time_t last_attempt; /* last attempt to reconnect */ - int ldap_port; - - int is_mine; /* do I own this structure's memory? */ - - /* info needed to find the server */ - struct { - char *realm; - char *workgroup; - char *ldap_server; - char *ldap_uri; - int foreign; /* set to 1 if connecting to a foreign realm */ - } server; - - /* info needed to authenticate */ - struct { - char *realm; - char *password; - char *user_name; - char *kdc_server; - uint_t flags; - int time_offset; - time_t expire; - } auth; - - /* info derived from the servers config */ - struct { - char *realm; - char *bind_path; - char *ldap_server_name; - time_t current_time; - } config; -} ADS_STRUCT; - -/* 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; - -typedef void **ADS_MODLIST; - -/* 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) - -/* time between reconnect attempts */ -#define ADS_RECONNECT_TIME 5 - -/* timeout on searches */ -#define ADS_SEARCH_TIMEOUT 10 /* ldap control oids */ #define ADS_PAGE_CTL_OID "1.2.840.113556.1.4.319" diff --git a/source4/include/includes.h b/source4/include/includes.h index ed8de0607d..3babb4eef5 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -95,11 +95,11 @@ struct ipv4_addr { #include "nt_status.h" #include "structs.h" #include "trans2.h" -#include "nterr.h" +#include "libcli/util/nterr.h" #include "charset/charset.h" #include "core.h" #include "debug.h" -#include "doserr.h" +#include "libcli/util/doserr.h" #include "enums.h" #include "smb_macros.h" #include "byteorder.h" diff --git a/source4/include/debug.h b/source4/lib/debug.h index 8ff937e7b9..8ff937e7b9 100644 --- a/source4/include/debug.h +++ b/source4/lib/debug.h diff --git a/source4/include/rap.h b/source4/libcli/rap/rap.h index c831f6f007..c831f6f007 100644 --- a/source4/include/rap.h +++ b/source4/libcli/rap/rap.h diff --git a/source4/include/doserr.h b/source4/libcli/util/doserr.h index 5b8ff1dd3d..5b8ff1dd3d 100644 --- a/source4/include/doserr.h +++ b/source4/libcli/util/doserr.h diff --git a/source4/include/nterr.h b/source4/libcli/util/nterr.h index 08e3fa2db0..08e3fa2db0 100644 --- a/source4/include/nterr.h +++ b/source4/libcli/util/nterr.h diff --git a/source4/ntvfs/ipc/ipc_rap.c b/source4/ntvfs/ipc/ipc_rap.c index d93b67b715..f97ae4cd89 100644 --- a/source4/ntvfs/ipc/ipc_rap.c +++ b/source4/ntvfs/ipc/ipc_rap.c @@ -20,7 +20,7 @@ */ #include "includes.h" -#include "rap.h" +#include "libcli/rap/rap.h" #define NERR_Success 0 #define NERR_badpass 86 diff --git a/source4/ntvfs/ipc/rap_server.c b/source4/ntvfs/ipc/rap_server.c index c69ba2d168..b68f806ba1 100644 --- a/source4/ntvfs/ipc/rap_server.c +++ b/source4/ntvfs/ipc/rap_server.c @@ -20,7 +20,7 @@ */ #include "includes.h" -#include "rap.h" +#include "libcli/rap/rap.h" #include "librpc/gen_ndr/ndr_srvsvc.h" /* At this moment these are just dummy functions, but you might get the diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c index e9cb45e3b0..77cf2a1c0a 100644 --- a/source4/torture/rap/rap.c +++ b/source4/torture/rap/rap.c @@ -21,7 +21,7 @@ #include "includes.h" #include "torture/torture.h" -#include "rap.h" +#include "libcli/rap/rap.h" #include "libcli/raw/libcliraw.h" #include "libcli/libcli.h" |