configure configure.in include/config.h.in include/includes.h

   Fixed bugs in readline autoconf.

param/loadparm.c smbd/open.c smbd/oplock.c: Started on kernel oplock
        code - checking forced by above issue. Should not be used
        currently.

Jeremy.
(This used to be commit f939efac9e6c45331b17e3d3aa6bc2235e886c1a)

3 files changed, 25 insertions, 9 deletions

diff --git a/source3/include/config.h.in b/source3/include/config.h.in
index 4e4127e448..b54b3635e4 100644
--- a/source3/include/config.h.in
+++ b/source3/include/config.h.in
@@ -314,6 +314,9 @@
 /* Define if you have the <grp.h> header file.  */
 #undef HAVE_GRP_H
 
+/* Define if you have the <history.h> header file.  */
+#undef HAVE_HISTORY_H
+
 /* Define if you have the <limits.h> header file.  */
 #undef HAVE_LIMITS_H
 
@@ -332,6 +335,15 @@
 /* Define if you have the <poll.h> header file.  */
 #undef HAVE_POLL_H
 
+/* Define if you have the <readline.h> header file.  */
+#undef HAVE_READLINE_H
+
+/* Define if you have the <readline/history.h> header file.  */
+#undef HAVE_READLINE_HISTORY_H
+
+/* Define if you have the <readline/readline.h> header file.  */
+#undef HAVE_READLINE_READLINE_H
+
 /* Define if you have the <rpc/auth.h> header file.  */
 #undef HAVE_RPC_AUTH_H
 
@@ -469,3 +481,6 @@
 
 /* Define if you have the socket library (-lsocket).  */
 #undef HAVE_LIBSOCKET
+
+/* Define if you have the readline library (-lreadline).  */
+#undef HAVE_LIBREADLINE
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 8c8ee32301..86887cec6d 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -357,7 +357,7 @@
 #ifdef LARGE_SMB_OFF_T
 #define SOFF_T(p, ofs, v) (SIVAL(p,ofs,(v)&0xFFFFFFFF), SIVAL(p,(ofs)+4,(v)>>32))
 #else 
-#define SOFF_T(p, ofs, v) SIVAL(p,ofs,v)
+#define SOFF_T(p, ofs, v) (SIVAL(p,ofs,v),SIVAL(p,(ofs)+4,0))
 #endif
 
 
@@ -611,13 +611,6 @@ union semun {
 #define ULTRIX_AUTH 1
 #endif
 
-/* This is the naughty bit.  Autoconf should declare these symbols if
-   it finds that GNU Readline is installed.  */
-
-#define HAVE_LIBREADLINE
-#define HAVE_READLINE_READLINE_H
-#define HAVE_READLINE_HISTORY_H
-
 #ifdef HAVE_LIBREADLINE
 #  ifdef HAVE_READLINE_READLINE_H
 #    include <readline/readline.h>
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 0df682c4e3..df6cb7ddcd 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -6,6 +6,11 @@
 /*The following definitions come from  client/client.c  */
 
 void do_dir(char *inbuf,char *outbuf,char *Mask,int attribute,void (*fn)(file_info *),BOOL recurse_dir, BOOL dirstoo);
+char *complete_cmd_null(char *text, int state);
+void complete_process_file(file_info *f);
+char *complete_remote_file(char *text, int state);
+char *complete_cmd(char *text, int state);
+char **completion_fn(char *text, int start, int end);
 
 /*The following definitions come from  client/clientutil.c  */
 
@@ -930,6 +935,7 @@ BOOL lp_passwd_chat_debug(void);
 BOOL lp_ole_locking_compat(void);
 BOOL lp_nt_smb_support(void);
 BOOL lp_stat_cache(void);
+BOOL lp_kernel_oplocks(void);
 int lp_os_level(void);
 int lp_max_ttl(void);
 int lp_max_wins_ttl(void);
@@ -1055,6 +1061,7 @@ int lp_default_server_announce(void);
 int lp_major_announce_version(void);
 int lp_minor_announce_version(void);
 void lp_set_name_resolve_order(char *new_order);
+void lp_set_kernel_oplocks(BOOL val);
 
 /*The following definitions come from  param/params.c  */
 
@@ -1794,7 +1801,7 @@ int reply_nttrans(connection_struct *conn,
 void fd_add_to_uid_cache(file_fd_struct *fd_ptr, uid_t u);
 uint16 fd_attempt_close(file_fd_struct *fd_ptr);
 void open_file_shared(files_struct *fsp,connection_struct *conn,char *fname,int share_mode,int ofun,
-		      mode_t mode,int oplock_request, int *Access,int *action);
+		      mode_t mode,int *oplock_request, int *Access,int *action);
 int open_directory(files_struct *fsp,connection_struct *conn,
 		   char *fname, int smb_ofun, mode_t unixmode, int *action);
 BOOL check_file_sharing(connection_struct *conn,char *fname, BOOL rename_op);
@@ -1806,6 +1813,7 @@ BOOL process_local_message(int sock, char *buffer, int buf_size);
 BOOL request_oplock_break(share_mode_entry *share_entry, 
                           SMB_DEV_T dev, SMB_INO_T inode);
 BOOL attempt_close_oplocked_file(files_struct *fsp);
+void check_kernel_oplocks(BOOL *have_oplocks);
 
 /*The following definitions come from  smbd/password.c  */