diff options
| author | Jeremy Allison <jra@samba.org> | 2001-04-13 19:12:06 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2001-04-13 19:12:06 +0000 |
| commit | 2ef68c7e92d4661664f0410509f7cb551e74a198 (patch) | |
| tree | 7a3ea392bf8664e28ad46b2edb1afd750335ccc9 /source3/include | |
| parent | 14748b0bf56239695cadb6aa40d9095259ebb6e2 (diff) | |
| download | samba-2ef68c7e92d4661664f0410509f7cb551e74a198.tar.gz samba-2ef68c7e92d4661664f0410509f7cb551e74a198.tar.bz2 samba-2ef68c7e92d4661664f0410509f7cb551e74a198.zip | |
Merge of Andrew's changes in 2.2.
Jeremy.
(This used to be commit fc76681812b1469208ad6c8847afdfc68bc6db49)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/config.h.in | 6 | ||||
| -rw-r--r-- | source3/include/proto.h | 5 |
2 files changed, 3 insertions, 8 deletions
diff --git a/source3/include/config.h.in b/source3/include/config.h.in index ec5cc13665..a60d927976 100644 --- a/source3/include/config.h.in +++ b/source3/include/config.h.in @@ -955,9 +955,6 @@ /* Define if you have the nsl_s library (-lnsl_s). */ #undef HAVE_LIBNSL_S -/* Define if you have the readline library (-lreadline). */ -#undef HAVE_LIBREADLINE - /* Define if you have the resolv library (-lresolv). */ #undef HAVE_LIBRESOLV @@ -969,6 +966,3 @@ /* Define if you have the socket library (-lsocket). */ #undef HAVE_LIBSOCKET - -/* Define if you have the termcap library (-ltermcap). */ -#undef HAVE_LIBTERMCAP diff --git a/source3/include/proto.h b/source3/include/proto.h index ff83fc103e..d5cc56eeb4 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -219,7 +219,7 @@ int vslprintf(char *str, int n, char *format, va_list ap); /*The following definitions come from lib/smbrun.c */ -int smbrun(char *cmd, int *outfd, char *template); +int smbrun(char *cmd, int *outfd); /*The following definitions come from lib/snprintf.c */ @@ -1191,6 +1191,7 @@ int share_mode_forall(SHAREMODE_FN(fn)); /*The following definitions come from locking/posix.c */ int fd_close_posix(struct connection_struct *conn, files_struct *fsp); +uint32 map_lock_offset(uint32 high, uint32 low); BOOL is_posix_locked(files_struct *fsp, SMB_BIG_UINT u_offset, SMB_BIG_UINT u_count, enum brl_type lock_type); BOOL set_posix_lock(files_struct *fsp, SMB_BIG_UINT u_offset, SMB_BIG_UINT u_count, enum brl_type lock_type); BOOL release_posix_lock(files_struct *fsp, SMB_BIG_UINT u_offset, SMB_BIG_UINT u_count); @@ -1587,7 +1588,6 @@ enum nss_status winbindd_request(int req_type, void lp_talloc_free(void); char *lp_logfile(void); -char *lp_smbrun(void); char *lp_configfile(void); char *lp_smb_passwd_file(void); char *lp_private_dir(void); @@ -1886,6 +1886,7 @@ BOOL pdb_generate_sam_sid(void); /*The following definitions come from passdb/pampass.c */ BOOL pam_session(BOOL flag, const connection_struct *conn, char *tty); +BOOL pam_accountcheck(char * user); BOOL pam_passcheck(char * user, char * password); /*The following definitions come from passdb/pass_check.c */ |