[GLUE] Rsync SAMBA_3_2_0 SVN r25598 in order to create the v3-2-test branch.

[samba.git] / source / include / includes.h

diff --git a/source/include/includes.h b/source/include/includes.h
index 238612a4383030e49862167d5a4ffe26d9856b82..a57891b76311b897b4fbf52a8e088162fe1649ab 100644 (file)
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -224,6 +224,10 @@ typedef int ber_int_t;
 #include <sys/attributes.h>
 #endif
 
+#ifndef ENOATTR
+#define ENOATTR ENODATA
+#endif
+
 /* mutually exclusive (SuSE 8.2) */
 #if HAVE_ATTR_XATTR_H
 #include <attr/xattr.h>
@@ -299,12 +303,6 @@ typedef sig_atomic_t VOLATILE SIG_ATOMIC_T;
 typedef int VOLATILE SIG_ATOMIC_T;
 #endif
 
-#ifndef HAVE_SOCKLEN_T_TYPE
-#define HAVE_SOCKLEN_T_TYPE
-typedef int socklen_t;
-#endif
-
-
 #ifndef uchar
 #define uchar unsigned char
 #endif
@@ -682,6 +680,7 @@ typedef int BOOL;
 #include "reg_objects.h"
 #include "reg_db.h"
 #include "rpc_samr.h"
+#include "rpc_srvsvc.h"
 #include "rpc_spoolss.h"
 #include "rpc_eventlog.h"
 #include "rpc_ds.h"
@@ -704,6 +703,7 @@ typedef int BOOL;
 #include "dbwrap.h"
 #include "packet.h"
 #include "ctdbd_conn.h"
+#include "talloc_stack.h"
 
 /*
  * Type for wide character dirent structure.
@@ -783,6 +783,8 @@ enum flush_reason_enum {
 #include "librpc/gen_ndr/srv_svcctl.h"
 #include "librpc/gen_ndr/srv_lsa.h"
 #include "librpc/gen_ndr/srv_eventlog.h"
+#include "librpc/gen_ndr/srv_winreg.h"
+#include "librpc/gen_ndr/srv_initshutdown.h"
 
 /***** automatically generated prototypes *****/
 #ifndef NO_PROTO_H
@@ -1207,11 +1209,6 @@ krb5_error_code smb_krb5_open_keytab(krb5_context context,
                                      const char *keytab_name, 
                                      BOOL write_access, 
                                      krb5_keytab *keytab);
-NTSTATUS kerberos_return_pac(TALLOC_CTX *mem_ctx,
-                             const char *name,
-                             const char *pass,
-                             time_t time_offset,
-                             PAC_DATA **pac_ret);
 #endif /* HAVE_KRB5 */