r23779: Change from v2 or later to v3 or later.

[kai/samba.git] / source3 / include / includes.h

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 6c1931844e66d65de05a329789ff4708c80dbc2e..f60d0895b1fc4e61457209997d20678470652a3a 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -8,7 +8,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -173,7 +173,7 @@
 
 #if HAVE_LBER_H
 #include <lber.h>
-#ifdef HPUX
+#if defined(HPUX) && !defined(_LBER_TYPES_H)
 /* Define ber_tag_t and ber_int_t for using
  * HP LDAP-UX Integration products' LDAP libraries.
 */
@@ -181,7 +181,7 @@
 typedef unsigned long ber_tag_t;
 typedef int ber_int_t;
 #endif
-#endif /* HPUX */
+#endif /* defined(HPUX) && !defined(_LBER_TYPES_H) */
 #ifndef LBER_USE_DER
 #define LBER_USE_DER 0x01
 #endif
@@ -681,14 +681,13 @@ typedef int BOOL;
 #include "rpc_lsa.h"
 #include "rpc_netlogon.h"
 #include "reg_objects.h"
+#include "reg_db.h"
 #include "rpc_samr.h"
 #include "rpc_spoolss.h"
 #include "rpc_eventlog.h"
 #include "rpc_ds.h"
 #include "rpc_perfcount.h"
 #include "rpc_perfcount_defs.h"
-#include "librpc/gen_ndr/srvsvc.h"
-#include "librpc/gen_ndr/echo.h"
 #include "librpc/gen_ndr/notify.h"
 #include "nt_printing.h"
 #include "idmap.h"
@@ -704,6 +703,8 @@ typedef int BOOL;
 #include "rpc_client.h"
 #include "event.h"
 #include "dbwrap.h"
+#include "packet.h"
+#include "ctdbd_conn.h"
 
 /*
  * Type for wide character dirent structure.
@@ -754,8 +755,6 @@ struct functable2 {
 
 struct printjob;
 
-struct smb_ldap_privates;
-
 /* forward declarations from smbldap.c */
 
 #include "smbldap.h"
@@ -782,6 +781,9 @@ enum flush_reason_enum {
 
 /* generated rpc server implementation functions */
 #include "librpc/gen_ndr/srv_echo.h"
+#include "librpc/gen_ndr/srv_svcctl.h"
+#include "librpc/gen_ndr/srv_lsa.h"
+#include "librpc/gen_ndr/srv_eventlog.h"
 
 /***** automatically generated prototypes *****/
 #ifndef NO_PROTO_H
@@ -1180,7 +1182,7 @@ BOOL smb_krb5_principal_compare_any_realm(krb5_context context,
 int cli_krb5_get_ticket(const char *principal, time_t time_offset, 
                        DATA_BLOB *ticket, DATA_BLOB *session_key_krb5, uint32 extra_ap_opts, const char *ccname, time_t *tgs_expire);
 PAC_LOGON_INFO *get_logon_info_from_pac(PAC_DATA *pac_data);
-krb5_error_code smb_krb5_renew_ticket(const char *ccache_string, const char *client_string, const char *service_string, time_t *new_start_time);
+krb5_error_code smb_krb5_renew_ticket(const char *ccache_string, const char *client_string, const char *service_string, time_t *expire_time);
 krb5_error_code kpasswd_err_to_krb5_err(krb5_error_code res_code);
 krb5_error_code smb_krb5_gen_netbios_krb5_address(smb_krb5_addresses **kerb_addr);
 krb5_error_code smb_krb5_free_addresses(krb5_context context, smb_krb5_addresses *addr);
@@ -1202,6 +1204,10 @@ krb5_enctype smb_get_enctype_from_kt_entry(const krb5_keytab_entry *kt_entry);
 krb5_error_code smb_krb5_enctype_to_string(krb5_context context, 
                                            krb5_enctype enctype, 
                                            char **etype_s);
+krb5_error_code smb_krb5_open_keytab(krb5_context context, 
+                                     const char *keytab_name, 
+                                     BOOL write_access, 
+                                     krb5_keytab *keytab);
 
 #endif /* HAVE_KRB5 */
 
@@ -1213,6 +1219,9 @@ LDAP *ldap_open_with_timeout(const char *server, int port, unsigned int to);
 
 #endif /* HAVE_LDAP */
 
+#if defined(HAVE_LINUX_READAHEAD) && ! defined(HAVE_READAHEAD_DECL)
+ssize_t readahead(int fd, off64_t offset, size_t count);
+#endif
 
 /* TRUE and FALSE are part of the C99 standard and gcc, but
    unfortunately many vendor compilers don't support them.  Use True