diff options
Diffstat (limited to 'packaging/Debian/debian/patches/fhs.patch')
| -rw-r--r-- | packaging/Debian/debian/patches/fhs.patch | 2289 |
1 files changed, 63 insertions, 2226 deletions
diff --git a/packaging/Debian/debian/patches/fhs.patch b/packaging/Debian/debian/patches/fhs.patch index f335474a7fc..bb28990a210 100644 --- a/packaging/Debian/debian/patches/fhs.patch +++ b/packaging/Debian/debian/patches/fhs.patch @@ -1,6 +1,6 @@ -diff -uNr --exclude=debian samba/source/Makefile.in samba-2.2.4/source/Makefile.in ---- samba/source/Makefile.in Wed May 1 23:13:15 2002 -+++ samba-2.2.4/source/Makefile.in Thu May 2 01:00:13 2002 +diff -uNr samba-2.2.5pre1.orig/source/Makefile.in samba-2.2.5pre1/source/Makefile.in +--- samba-2.2.5pre1.orig/source/Makefile.in Wed Jun 12 15:26:50 2002 ++++ samba-2.2.5pre1/source/Makefile.in Wed Jun 12 15:30:29 2002 @@ -83,7 +83,7 @@ FLAGS1 = $(CFLAGS) @FLAGS1@ -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -DLOGFILEBASE=\"$(LOGFILEBASE)\" FLAGS2 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\" @@ -10,20 +10,20 @@ diff -uNr --exclude=debian samba/source/Makefile.in samba-2.2.4/source/Makefile. FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) -DHAVE_INCLUDES_H FLAGS = $(ISA) $(FLAGS5) $(PASSWD_FLAGS) FLAGS32 = $(ISA32) $(FLAGS5) $(PASSWD_FLAGS) -diff -uNr --exclude=debian samba/source/acconfig.h samba-2.2.4/source/acconfig.h ---- samba/source/acconfig.h Wed May 1 23:13:15 2002 -+++ samba-2.2.4/source/acconfig.h Thu May 2 01:00:33 2002 -@@ -176,6 +176,7 @@ +diff -uNr samba-2.2.5pre1.orig/source/acconfig.h samba-2.2.5pre1/source/acconfig.h +--- samba-2.2.5pre1.orig/source/acconfig.h Fri May 17 11:22:12 2002 ++++ samba-2.2.5pre1/source/acconfig.h Wed Jun 12 15:30:29 2002 +@@ -177,6 +177,7 @@ #undef HAVE_DEVICE_MAJOR_FN #undef HAVE_DEVICE_MINOR_FN #undef HAVE_MAKEDEV_FN +#undef FHS_COMPATIBLE #undef HAVE_GETGROUPS_TOO_MANY_EGIDS - /* - * Add these definitions to allow VFS modules to -diff -uNr --exclude=debian samba/source/configure.in samba-2.2.4/source/configure.in ---- samba/source/configure.in Wed May 1 23:13:57 2002 -+++ samba-2.2.4/source/configure.in Thu May 2 01:01:58 2002 + #undef HAVE_PASSWD_PW_COMMENT + #undef HAVE_PASSWD_PW_AGE +diff -uNr samba-2.2.5pre1.orig/source/configure.in samba-2.2.5pre1/source/configure.in +--- samba-2.2.5pre1.orig/source/configure.in Wed Jun 12 15:28:30 2002 ++++ samba-2.2.5pre1/source/configure.in Wed Jun 12 15:30:29 2002 @@ -12,11 +12,12 @@ [ --with-fhs Use FHS-compliant paths (default=no)], codepagedir="\$(DATADIR)/samba/codepages" @@ -39,20 +39,20 @@ diff -uNr --exclude=debian samba/source/configure.in samba-2.2.4/source/configur codepagedir="\$(LIBDIR)/codepages" configdir="\$(LIBDIR)" logfilebase="\$(VARDIR)" -diff -uNr --exclude=debian samba/source/include/config.h.in samba-2.2.4/source/include/config.h.in ---- samba/source/include/config.h.in Wed May 1 23:14:00 2002 -+++ samba-2.2.4/source/include/config.h.in Thu May 2 01:02:36 2002 -@@ -242,6 +242,7 @@ +diff -uNr samba-2.2.5pre1.orig/source/include/config.h.in samba-2.2.5pre1/source/include/config.h.in +--- samba-2.2.5pre1.orig/source/include/config.h.in Sat Jun 8 07:55:55 2002 ++++ samba-2.2.5pre1/source/include/config.h.in Wed Jun 12 15:30:29 2002 +@@ -243,6 +243,7 @@ #undef HAVE_DEVICE_MAJOR_FN #undef HAVE_DEVICE_MINOR_FN #undef HAVE_MAKEDEV_FN +#undef FHS_COMPATIBLE #undef HAVE_GETGROUPS_TOO_MANY_EGIDS - /* - * Add these definitions to allow VFS modules to -diff -uNr --exclude=debian samba/source/include/local.h samba-2.2.4/source/include/local.h ---- samba/source/include/local.h Sat Feb 2 16:02:43 2002 -+++ samba-2.2.4/source/include/local.h Thu May 2 01:03:45 2002 + #undef HAVE_PASSWD_PW_COMMENT + #undef HAVE_PASSWD_PW_AGE +diff -uNr samba-2.2.5pre1.orig/source/include/local.h samba-2.2.5pre1/source/include/local.h +--- samba-2.2.5pre1.orig/source/include/local.h Tue Jan 15 10:02:37 2002 ++++ samba-2.2.5pre1/source/include/local.h Wed Jun 12 15:30:29 2002 @@ -189,4 +189,20 @@ /* Allocation roundup. */ #define SMB_ROUNDUP_ALLOCATION_SIZE 0x100000 @@ -74,10 +74,10 @@ diff -uNr --exclude=debian samba/source/include/local.h samba-2.2.4/source/inclu +#endif + #endif -diff -uNr --exclude=debian samba/source/lib/util.c samba-2.2.4/source/lib/util.c ---- samba/source/lib/util.c Wed May 1 23:14:23 2002 -+++ samba-2.2.4/source/lib/util.c Thu May 2 01:08:20 2002 -@@ -1856,6 +1856,46 @@ +diff -uNr samba-2.2.5pre1.orig/source/lib/util.c samba-2.2.5pre1/source/lib/util.c +--- samba-2.2.5pre1.orig/source/lib/util.c Mon Jun 3 21:11:11 2002 ++++ samba-2.2.5pre1/source/lib/util.c Wed Jun 12 15:30:29 2002 +@@ -1860,6 +1860,46 @@ return fname; } @@ -124,9 +124,9 @@ diff -uNr --exclude=debian samba/source/lib/util.c samba-2.2.4/source/lib/util.c /******************************************************************* Given a filename - get its directory name NB: Returned in static storage. Caveats: -diff -uNr --exclude=debian samba/source/nmbd/nmbd_serverlistdb.c samba-2.2.4/source/nmbd/nmbd_serverlistdb.c ---- samba/source/nmbd/nmbd_serverlistdb.c Sat Feb 2 16:02:55 2002 -+++ samba-2.2.4/source/nmbd/nmbd_serverlistdb.c Thu May 2 01:09:23 2002 +diff -uNr samba-2.2.5pre1.orig/source/nmbd/nmbd_serverlistdb.c samba-2.2.5pre1/source/nmbd/nmbd_serverlistdb.c +--- samba-2.2.5pre1.orig/source/nmbd/nmbd_serverlistdb.c Mon Jan 21 10:35:19 2002 ++++ samba-2.2.5pre1/source/nmbd/nmbd_serverlistdb.c Wed Jun 12 15:30:29 2002 @@ -348,7 +348,7 @@ updatecount++; @@ -136,9 +136,9 @@ diff -uNr --exclude=debian samba/source/nmbd/nmbd_serverlistdb.c samba-2.2.4/sou trim_string(fname,NULL,"/"); pstrcat(fname,"/"); pstrcat(fname,SERVER_LIST); -diff -uNr --exclude=debian samba/source/nmbd/nmbd_winsserver.c samba-2.2.4/source/nmbd/nmbd_winsserver.c ---- samba/source/nmbd/nmbd_winsserver.c Wed May 1 23:14:38 2002 -+++ samba-2.2.4/source/nmbd/nmbd_winsserver.c Thu May 2 01:10:42 2002 +diff -uNr samba-2.2.5pre1.orig/source/nmbd/nmbd_winsserver.c samba-2.2.5pre1/source/nmbd/nmbd_winsserver.c +--- samba-2.2.5pre1.orig/source/nmbd/nmbd_winsserver.c Fri Mar 1 08:32:13 2002 ++++ samba-2.2.5pre1/source/nmbd/nmbd_winsserver.c Wed Jun 12 15:30:29 2002 @@ -178,7 +178,7 @@ add_samba_names_to_subnet(wins_server_subnet); @@ -148,9 +148,9 @@ diff -uNr --exclude=debian samba/source/nmbd/nmbd_winsserver.c samba-2.2.4/sourc { DEBUG(2,("initialise_wins: Can't open wins database file %s. Error was %s\n", WINS_LIST, strerror(errno) )); -diff -uNr --exclude=debian samba/source/nsswitch/winbindd_cache.c samba-2.2.4/source/nsswitch/winbindd_cache.c ---- samba/source/nsswitch/winbindd_cache.c Wed May 1 23:14:43 2002 -+++ samba-2.2.4/source/nsswitch/winbindd_cache.c Thu May 2 01:11:45 2002 +diff -uNr samba-2.2.5pre1.orig/source/nsswitch/winbindd_cache.c samba-2.2.5pre1/source/nsswitch/winbindd_cache.c +--- samba-2.2.5pre1.orig/source/nsswitch/winbindd_cache.c Wed Jun 5 07:02:34 2002 ++++ samba-2.2.5pre1/source/nsswitch/winbindd_cache.c Wed Jun 12 15:30:29 2002 @@ -50,7 +50,7 @@ } if (opt_nocache) return; @@ -160,9 +160,9 @@ diff -uNr --exclude=debian samba/source/nsswitch/winbindd_cache.c samba-2.2.4/so TDB_DEFAULT, O_RDWR | O_CREAT | O_TRUNC, 0600); if (!wcache->tdb) { -diff -uNr --exclude=debian samba/source/nsswitch/winbindd_idmap.c samba-2.2.4/source/nsswitch/winbindd_idmap.c ---- samba/source/nsswitch/winbindd_idmap.c Wed May 1 23:14:44 2002 -+++ samba-2.2.4/source/nsswitch/winbindd_idmap.c Thu May 2 01:12:51 2002 +diff -uNr samba-2.2.5pre1.orig/source/nsswitch/winbindd_idmap.c samba-2.2.5pre1/source/nsswitch/winbindd_idmap.c +--- samba-2.2.5pre1.orig/source/nsswitch/winbindd_idmap.c Wed May 1 11:56:29 2002 ++++ samba-2.2.5pre1/source/nsswitch/winbindd_idmap.c Wed Jun 12 15:30:29 2002 @@ -427,14 +427,14 @@ { /* Open tdb cache */ @@ -180,9 +180,9 @@ diff -uNr --exclude=debian samba/source/nsswitch/winbindd_idmap.c samba-2.2.4/so DEBUG(0, ("winbindd_idmap_init: Unable to open idmap database\n")); return False; } -diff -uNr --exclude=debian samba/source/param/loadparm.c samba-2.2.4/source/param/loadparm.c ---- samba/source/param/loadparm.c Wed May 1 23:14:47 2002 -+++ samba-2.2.4/source/param/loadparm.c Thu May 2 01:20:33 2002 +diff -uNr samba-2.2.5pre1.orig/source/param/loadparm.c samba-2.2.5pre1/source/param/loadparm.c +--- samba-2.2.5pre1.orig/source/param/loadparm.c Thu May 30 23:13:00 2002 ++++ samba-2.2.5pre1/source/param/loadparm.c Wed Jun 12 15:30:29 2002 @@ -107,6 +107,9 @@ char *szAddPrinterCommand; char *szDeletePrinterCommand; @@ -193,7 +193,7 @@ diff -uNr --exclude=debian samba/source/param/loadparm.c samba-2.2.4/source/para char *szLockDir; char *szPidDir; char *szRootdir; -@@ -1023,8 +1026,13 @@ +@@ -1025,8 +1028,13 @@ {"config file", P_STRING, P_GLOBAL, &Globals.szConfigFile, NULL, NULL, FLAG_HIDE}, {"preload", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_DOS_STRING}, {"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_DOS_STRING}, @@ -207,9 +207,9 @@ diff -uNr --exclude=debian samba/source/param/loadparm.c samba-2.2.4/source/para {"pid directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, 0}, #ifdef WITH_UTMP {"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, 0}, -diff -uNr --exclude=debian samba/source/printing/nt_printing.c samba-2.2.4/source/printing/nt_printing.c ---- samba/source/printing/nt_printing.c Wed May 1 23:14:51 2002 -+++ samba-2.2.4/source/printing/nt_printing.c Thu May 2 01:14:04 2002 +diff -uNr samba-2.2.5pre1.orig/source/printing/nt_printing.c samba-2.2.5pre1/source/printing/nt_printing.c +--- samba-2.2.5pre1.orig/source/printing/nt_printing.c Thu Jun 6 08:15:02 2002 ++++ samba-2.2.5pre1/source/printing/nt_printing.c Wed Jun 12 15:30:29 2002 @@ -263,24 +263,24 @@ if (tdb_drivers && tdb_printers && tdb_forms && local_pid == sys_getpid()) return True; @@ -241,9 +241,9 @@ diff -uNr --exclude=debian samba/source/printing/nt_printing.c samba-2.2.4/sourc return False; } -diff -uNr --exclude=debian samba/source/printing/printing.c samba-2.2.4/source/printing/printing.c ---- samba/source/printing/printing.c Wed May 1 23:14:52 2002 -+++ samba-2.2.4/source/printing/printing.c Thu May 2 01:15:27 2002 +diff -uNr samba-2.2.5pre1.orig/source/printing/printing.c samba-2.2.5pre1/source/printing/printing.c +--- samba-2.2.5pre1.orig/source/printing/printing.c Fri Apr 19 14:05:01 2002 ++++ samba-2.2.5pre1/source/printing/printing.c Wed Jun 12 15:30:30 2002 @@ -55,10 +55,10 @@ if (tdb && local_pid == sys_getpid()) @@ -257,9 +257,9 @@ diff -uNr --exclude=debian samba/source/printing/printing.c samba-2.2.4/source/p return False; } local_pid = sys_getpid(); -diff -uNr --exclude=debian samba/source/rpc_server/srv_srvsvc_nt.c samba-2.2.4/source/rpc_server/srv_srvsvc_nt.c ---- samba/source/rpc_server/srv_srvsvc_nt.c Wed May 1 23:15:06 2002 -+++ samba-2.2.4/source/rpc_server/srv_srvsvc_nt.c Thu May 2 01:16:15 2002 +diff -uNr samba-2.2.5pre1.orig/source/rpc_server/srv_srvsvc_nt.c samba-2.2.5pre1/source/rpc_server/srv_srvsvc_nt.c +--- samba-2.2.5pre1.orig/source/rpc_server/srv_srvsvc_nt.c Thu Jun 6 08:15:03 2002 ++++ samba-2.2.5pre1/source/rpc_server/srv_srvsvc_nt.c Wed Jun 12 15:30:30 2002 @@ -127,10 +127,10 @@ if (share_tdb && local_pid == sys_getpid()) @@ -273,9 +273,9 @@ diff -uNr --exclude=debian samba/source/rpc_server/srv_srvsvc_nt.c samba-2.2.4/s return False; } -diff -uNr --exclude=debian samba/source/smbd/lanman.c samba-2.2.4/source/smbd/lanman.c ---- samba/source/smbd/lanman.c Wed May 1 23:15:08 2002 -+++ samba-2.2.4/source/smbd/lanman.c Thu May 2 01:16:55 2002 +diff -uNr samba-2.2.5pre1.orig/source/smbd/lanman.c samba-2.2.5pre1/source/smbd/lanman.c +--- samba-2.2.5pre1.orig/source/smbd/lanman.c Mon Mar 18 17:55:49 2002 ++++ samba-2.2.5pre1/source/smbd/lanman.c Wed Jun 12 15:30:30 2002 @@ -1109,9 +1109,9 @@ BOOL local_list_only; int i; @@ -288,2179 +288,16 @@ diff -uNr --exclude=debian samba/source/smbd/lanman.c samba-2.2.4/source/smbd/la return(0); } -diff -uNr --exclude=debian samba/source/include/proto.h samba-2.2.4/source/include/proto.h ---- samba/source/include/proto.h Wed May 1 23:14:14 2002 -+++ samba-2.2.4/source/include/proto.h Thu May 2 01:28:16 2002 -@@ -181,134 +181,650 @@ - void CatchChild(void); - void CatchChildLeaveStatus(void); - --/* The following definitions come from libsmb/cliconnect.c */ -+/* The following definitions come from lib/smbrun.c */ - --BOOL cli_session_setup(struct cli_state *cli, -- char *user, -- char *pass, int passlen, -- char *ntpass, int ntpasslen, -- char *workgroup); --BOOL cli_ulogoff(struct cli_state *cli); --BOOL cli_send_tconX(struct cli_state *cli, -- const char *share, const char *dev, const char *pass, int passlen); --BOOL cli_tdis(struct cli_state *cli); --void cli_negprot_send(struct cli_state *cli); --BOOL cli_negprot(struct cli_state *cli); --BOOL cli_session_request(struct cli_state *cli, -- struct nmb_name *calling, struct nmb_name *called); --BOOL cli_connect(struct cli_state *cli, const char *host, struct in_addr *ip); --BOOL cli_establish_connection(struct cli_state *cli, -- char *dest_host, struct in_addr *dest_ip, -- struct nmb_name *calling, struct nmb_name *called, -- char *service, char *service_type, -- BOOL do_shutdown, BOOL do_tcon); --NTSTATUS cli_full_connection(struct cli_state **output_cli, -- const char *my_name, const char *dest_host, -- struct in_addr *dest_ip, int port, -- char *service, char *service_type, -- char *user, char *domain, -- char *password, int pass_len) ; --BOOL attempt_netbios_session_request(struct cli_state *cli, char *srchost, char *desthost, -- struct in_addr *pdest_ip); -+int smbrun(char *cmd, int *outfd); - --/* The following definitions come from libsmb/cli_dfs.c */ -+/* The following definitions come from lib/snprintf.c */ - --struct cli_state *cli_dfs_initialise(struct cli_state *cli, char *system_name, -- struct ntuser_creds *creds); --NTSTATUS cli_dfs_exist(struct cli_state *cli, TALLOC_CTX *mem_ctx, -- BOOL *dfs_exists); --NTSTATUS cli_dfs_add(struct cli_state *cli, TALLOC_CTX *mem_ctx, -- char *entrypath, char *servername, char *sharename, -- char *comment, uint32 flags); --NTSTATUS cli_dfs_remove(struct cli_state *cli, TALLOC_CTX *mem_ctx, -- char *entrypath, char *servername, char *sharename); --NTSTATUS cli_dfs_get_info(struct cli_state *cli, TALLOC_CTX *mem_ctx, -- char *entrypath, char *servername, char *sharename, -- uint32 info_level, DFS_INFO_CTR *ctr); --NTSTATUS cli_dfs_enum(struct cli_state *cli, TALLOC_CTX *mem_ctx, -- uint32 info_level, DFS_INFO_CTR *ctr); - --/* The following definitions come from libsmb/clidgram.c */ -+/* The following definitions come from lib/substitute.c */ -+ -+void standard_sub_basic(char *str); -+void standard_sub_advanced(int snum, char *user, char *connectpath, gid_t gid, char *str); -+void standard_sub_conn(connection_struct *conn, char *str); -+void standard_sub_home(int snum, char *user, char *str); -+void standard_sub_snum(int snum, char *str); -+void standard_sub_vuser(char *str, user_struct *vuser); -+void standard_sub_vsnum(char *str, user_struct *vuser, int snum); -+ -+/* The following definitions come from lib/sysacls.c */ -+ -+int sys_acl_get_entry( SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p); -+int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p); -+int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p); -+void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d); -+SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type); -+SMB_ACL_T sys_acl_get_fd(int fd); -+int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset); -+int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm); -+int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm); -+char *sys_acl_to_text( SMB_ACL_T the_acl, ssize_t *plen); -+SMB_ACL_T sys_acl_init( int count); -+int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry); -+int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype); -+int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual); -+int sys_acl_set_permset( SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset); -+int sys_acl_valid( SMB_ACL_T theacl ); -+int sys_acl_set_file( const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl); -+int sys_acl_set_fd( int fd, SMB_ACL_T theacl); -+int sys_acl_delete_def_file(const char *name); -+int sys_acl_free_text(char *text); -+int sys_acl_free_acl(SMB_ACL_T the_acl) ; -+int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype); -+int sys_acl_get_entry( SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p); -+int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p); -+int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p); -+void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d); -+SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type); -+SMB_ACL_T sys_acl_get_fd(int fd); -+int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset); -+int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm); -+int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm); -+char *sys_acl_to_text( SMB_ACL_T the_acl, ssize_t *plen); -+SMB_ACL_T sys_acl_init( int count); -+int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry); -+int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype); -+int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual); -+int sys_acl_set_permset( SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset); -+int sys_acl_valid( SMB_ACL_T theacl ); -+int sys_acl_set_file( const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl); -+int sys_acl_set_fd( int fd, SMB_ACL_T theacl); -+int sys_acl_delete_def_file(const char *name); -+int sys_acl_free_text(char *text); -+int sys_acl_free_acl(SMB_ACL_T the_acl) ; -+int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype); -+int sys_acl_get_entry(SMB_ACL_T acl_d, int entry_id, SMB_ACL_ENTRY_T *entry_p); -+int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *type_p); -+int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p); -+void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d); -+SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type); -+SMB_ACL_T sys_acl_get_fd(int fd); -+int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset_d); -+int sys_acl_add_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm); -+int sys_acl_get_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm); -+char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p); -+SMB_ACL_T sys_acl_init(int count); -+int sys_acl_create_entry(SMB_ACL_T *acl_p, SMB_ACL_ENTRY_T *entry_p); -+int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T tag_type); -+int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p); -+int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d); -+int sys_acl_valid(SMB_ACL_T acl_d); -+int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d); -+int sys_acl_set_fd(int fd, SMB_ACL_T acl_d); -+int sys_acl_delete_def_file(const char *path); -+int sys_acl_free_text(char *text); -+int sys_acl_free_acl(SMB_ACL_T acl_d) ; -+int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype); -+int sys_acl_get_entry(SMB_ACL_T acl_d, int entry_id, SMB_ACL_ENTRY_T *entry_p); -+int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *type_p); -+int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p); -+void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d); -+SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type); -+SMB_ACL_T sys_acl_get_fd(int fd); -+int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset_d); -+int sys_acl_add_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm); -+int sys_acl_get_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm); -+char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p); -+SMB_ACL_T sys_acl_init(int count); -+int sys_acl_create_entry(SMB_ACL_T *acl_p, SMB_ACL_ENTRY_T *entry_p); -+int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T tag_type); -+int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p); -+int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d); -+int sys_acl_valid(SMB_ACL_T acl_d); -+int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d); -+int sys_acl_set_fd(int fd, SMB_ACL_T acl_d); -+int sys_acl_delete_def_file(const char *path); -+int sys_acl_free_text(char *text); -+int sys_acl_free_acl(SMB_ACL_T acl_d) ; -+int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype); -+int sys_acl_get_entry(SMB_ACL_T acl_d, int entry_id, SMB_ACL_ENTRY_T *entry_p); -+int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *type_p); -+int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p); -+void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d); -+SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type); -+SMB_ACL_T sys_acl_get_fd(int fd); -+int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset_d); -+int sys_acl_add_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm); -+int sys_acl_get_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm); -+char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p); -+SMB_ACL_T sys_acl_init(int count); -+int sys_acl_create_entry(SMB_ACL_T *acl_p, SMB_ACL_ENTRY_T *entry_p); -+int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T tag_type); -+int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p); -+int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d); -+int sys_acl_valid(SMB_ACL_T acl_d); -+int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d); -+int sys_acl_set_fd(int fd, SMB_ACL_T acl_d); -+int sys_acl_delete_def_file(const char *name); -+int sys_acl_free_text(char *text); -+int sys_acl_free_acl(SMB_ACL_T acl_d) ; -+int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype); -+int sys_acl_get_entry( SMB_ACL_T theacl, int entry_id, SMB_ACL_ENTRY_T *entry_p); -+int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p); -+int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p); -+void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d); -+SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type); -+SMB_ACL_T sys_acl_get_fd(int fd); -+int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset); -+int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm); -+char *sys_acl_to_text( SMB_ACL_T theacl, ssize_t *plen); -+SMB_ACL_T sys_acl_init( int count); -+int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry); -+int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype); -+int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual); -+int sys_acl_set_permset( SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset); -+int sys_acl_valid( SMB_ACL_T theacl ); -+int sys_acl_set_file( const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl); -+int sys_acl_set_fd( int fd, SMB_ACL_T theacl); -+int sys_acl_delete_def_file(const char *name); -+int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm); -+int sys_acl_free_text(char *text); -+int sys_acl_free_acl(SMB_ACL_T posix_acl); -+int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype); -+int sys_acl_get_entry( SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p); -+int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p); -+int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p); -+void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d); -+SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type); -+SMB_ACL_T sys_acl_get_fd(int fd); -+int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset); -+int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm); -+int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm); -+char *sys_acl_to_text( SMB_ACL_T the_acl, ssize_t *plen); -+int sys_acl_free_text(char *text); -+SMB_ACL_T sys_acl_init( int count); -+int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry); -+int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype); -+int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual); -+int sys_acl_set_permset( SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset); -+int sys_acl_valid( SMB_ACL_T theacl ); -+int sys_acl_set_file( const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl); -+int sys_acl_set_fd( int fd, SMB_ACL_T theacl); -+int sys_acl_delete_def_file(const char *name); -+int sys_acl_free_acl(SMB_ACL_T the_acl) ; -+int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype); -+ -+/* The following definitions come from lib/system.c */ -+ -+int sys_usleep(long usecs); -+ssize_t sys_read(int fd, void *buf, size_t count); -+ssize_t sys_write(int fd, const void *buf, size_t count); -+ssize_t sys_send(int s, const void *msg, size_t len, int flags); -+ssize_t sys_sendto(int s, const void *msg, size_t len, int flags, const struct sockaddr *to, socklen_t tolen); -+ssize_t sys_recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlen); -+int sys_fcntl_ptr(int fd, int cmd, void *arg); -+int sys_fcntl_long(int fd, int cmd, long arg); -+int sys_stat(const char *fname,SMB_STRUCT_STAT *sbuf); -+int sys_fstat(int fd,SMB_STRUCT_STAT *sbuf); -+int sys_lstat(const char *fname,SMB_STRUCT_STAT *sbuf); -+int sys_ftruncate(int fd, SMB_OFF_T offset); -+SMB_OFF_T sys_lseek(int fd, SMB_OFF_T offset, int whence); -+int sys_fseek(FILE *fp, SMB_OFF_T offset, int whence); -+SMB_OFF_T sys_ftell(FILE *fp); -+int sys_creat(const char *path, mode_t mode); -+int sys_open(const char *path, int oflag, mode_t mode); -+FILE *sys_fopen(const char *path, const char *type); -+SMB_STRUCT_DIRENT *sys_readdir(DIR *dirp); -+int sys_mknod(const char *path, mode_t mode, SMB_DEV_T dev); -+char *sys_realpath(const char *path, char *resolved_path); -+int sys_waitpid(pid_t pid,int *status,int options); -+char *sys_getwd(char *s); -+int sys_symlink(const char *oldpath, const char *newpath); -+int sys_readlink(const char *path, char *buf, size_t bufsiz); -+int sys_link(const char *oldpath, const char *newpath); -+int sys_chown(const char *fname,uid_t uid,gid_t gid); -+int sys_chroot(const char *dname); -+struct hostent *sys_gethostbyname(const char *name); -+void oplock_set_capability(BOOL this_process, BOOL inherit); -+long sys_random(void); -+void sys_srandom(unsigned int seed); -+int groups_max(void); -+int sys_getgroups(int setlen, gid_t *gidset); -+int sys_setgroups(int setlen, gid_t *gidset); -+void sys_setpwent(void); -+struct passwd *sys_getpwent(void); -+void sys_endpwent(void); -+struct passwd *sys_getpwnam(const char *name); -+struct passwd *sys_getpwuid(uid_t uid); -+int wsys_stat(const smb_ucs2_t *wfname,SMB_STRUCT_STAT *sbuf); -+int wsys_lstat(const smb_ucs2_t *wfname,SMB_STRUCT_STAT *sbuf); -+int wsys_creat(const smb_ucs2_t *wfname, mode_t mode); -+int wsys_open(const smb_ucs2_t *wfname, int oflag, mode_t mode); -+FILE *wsys_fopen(const smb_ucs2_t *wfname, const char *type); -+DIR *wsys_opendir(const smb_ucs2_t *wfname); -+smb_ucs2_t *wsys_getwd(smb_ucs2_t *s); -+int wsys_chown(const smb_ucs2_t *wfname, uid_t uid, gid_t gid); -+int wsys_chroot(const smb_ucs2_t *wfname); -+pid_t sys_fork(void); -+pid_t sys_getpid(void); -+int sys_popen(const char *command); -+int sys_pclose(int fd); -+void *sys_dlopen(const char *name, int flags); -+void *sys_dlsym(void *handle, char *symbol); -+int sys_dlclose (void *handle); -+const char *sys_dlerror(void); -+void sys_adminlog(int priority, const char *format_str, ...); -+ -+/* The following definitions come from lib/talloc.c */ -+ -+TALLOC_CTX *talloc_init(void); -+void *talloc(TALLOC_CTX *t, size_t size); -+void *talloc_realloc(TALLOC_CTX *t, void *ptr, size_t size); -+void talloc_destroy_pool(TALLOC_CTX *t); -+void talloc_destroy(TALLOC_CTX *t); -+size_t talloc_pool_size(TALLOC_CTX *t); -+const char * talloc_pool_name(TALLOC_CTX const *t); -+void *talloc_zero(TALLOC_CTX *t, size_t size); -+void *talloc_memdup(TALLOC_CTX *t, const void *p, size_t size); -+char *talloc_strdup(TALLOC_CTX *t, const char *p); -+char *talloc_describe_all(TALLOC_CTX *rt); -+void talloc_get_allocation(TALLOC_CTX *t, -+ size_t *total_bytes, -+ int *n_chunks); -+ -+/* The following definitions come from lib/time.c */ -+ -+time_t get_time_t_min(void); -+time_t get_time_t_max(void); -+void GetTimeOfDay(struct timeval *tval); -+void TimeInit(void); -+void get_process_uptime(struct timeval *ret_time); -+int TimeDiff(time_t t); -+struct tm *LocalTime(time_t *t); -+time_t nt_time_to_unix(NTTIME *nt); -+time_t nt_time_to_unix_abs(NTTIME *nt); -+time_t interpret_long_date(char *p); -+void unix_to_nt_time(NTTIME *nt, time_t t); -+void unix_to_nt_time_abs(NTTIME *nt, time_t t); -+void put_long_date(char *p,time_t t); -+BOOL null_mtime(time_t mtime); -+void put_dos_date(char *buf,int offset,time_t unixdate); -+void put_dos_date2(char *buf,int offset,time_t unixdate); -+void put_dos_date3(char *buf,int offset,time_t unixdate); -+time_t make_unix_date(void *date_ptr); -+time_t make_unix_date2(void *date_ptr); -+time_t make_unix_date3(void *date_ptr); -+char *http_timestring(time_t t); -+char *timestring(BOOL hires); -+time_t get_create_time(SMB_STRUCT_STAT *st,BOOL fake_dirs); -+void init_nt_time(NTTIME *nt); -+ -+/* The following definitions come from lib/ufc.c */ -+ -+char *ufc_crypt(const char *key,const char *salt); -+ -+/* The following definitions come from lib/username.c */ -+ -+BOOL name_is_local(const char *name); -+char *get_user_home_dir(char *user); -+char *get_user_service_home_dir(char *user); -+BOOL map_username(char *user); -+struct passwd *Get_Pwnam(char *user,BOOL allow_change); -+BOOL user_in_group_list(char *user,char *gname); -+BOOL user_in_list(char *user,char *list); -+struct passwd *smb_getpwnam(char *user, BOOL allow_change); -+ -+/* The following definitions come from lib/util.c */ -+ -+char *tmpdir(void); -+BOOL in_group(gid_t group, gid_t current_gid, int ngroups, gid_t *groups); -+char *Atoic(char *p, int *n, char *c); -+char *get_numlist(char *p, uint32 **num, int *count); -+BOOL file_exist(char *fname,SMB_STRUCT_STAT *sbuf); -+time_t file_modtime(char *fname); -+BOOL directory_exist(char *dname,SMB_STRUCT_STAT *st); -+SMB_OFF_T get_file_size(char *file_name); -+char *attrib_string(uint16 mode); -+void show_msg(char *buf); -+void smb_setlen(char *buf,int len); -+int set_message(char *buf,int num_words,int num_bytes,BOOL zero); -+int set_message_bcc(char *buf,int num_bytes); -+int set_message_end(void *outbuf,void *end_ptr); -+void dos_clean_name(char *s); -+void unix_clean_name(char *s); -+void make_dir_struct(char *buf,char *mask,char *fname,SMB_OFF_T size,int mode,time_t date); -+void close_low_fds(void); -+int set_blocking(int fd, BOOL set); -+ssize_t transfer_file_internal(int infd, int outfd, size_t n, ssize_t (*read_fn)(int, void *, size_t), -+ ssize_t (*write_fn)(int, const void *, size_t)); -+SMB_OFF_T transfer_file(int infd,int outfd,SMB_OFF_T n); -+void msleep(unsigned int t); -+void become_daemon(void); -+BOOL yesno(char *p); -+void *Realloc(void *p,size_t size); -+void safe_free(void *p); -+BOOL get_myname(char *my_name); -+int interpret_protocol(char *str,int def); -+BOOL is_ipaddress(const char *str); -+uint32 interpret_addr(const char *str); -+struct in_addr *interpret_addr2(const char *str); -+BOOL is_zero_ip(struct in_addr ip); -+void zero_ip(struct in_addr *ip); -+char *automount_lookup(char *user_name); -+char *automount_lookup(char *user_name); -+BOOL same_net(struct in_addr ip1,struct in_addr ip2,struct in_addr mask); -+BOOL process_exists(pid_t pid); -+char *uidtoname(uid_t uid); -+char *gidtoname(gid_t gid); -+uid_t nametouid(char *name); -+gid_t nametogid(char *name); -+void smb_panic(char *why); -+char *readdirname(DIR *p); -+BOOL is_in_path(char *name, name_compare_entry *namelist); -+void set_namearray(name_compare_entry **ppname_array, char *namelist); -+void free_namearray(name_compare_entry *name_array); -+BOOL fcntl_lock(int fd, int op, SMB_OFF_T offset, SMB_OFF_T count, int type); -+BOOL is_myname(char *s); -+const char* get_my_primary_ip (void); -+BOOL is_myname_or_ipaddr(char *s); -+void set_remote_arch(enum remote_arch_types type); -+enum remote_arch_types get_remote_arch(void); -+void out_ascii(FILE *f, unsigned char *buf,int len); -+void out_data(FILE *f,char *buf1,int len, int per_line); -+void print_asc(int level, unsigned char *buf,int len); -+void dump_data(int level,char *buf1,int len); -+char *tab_depth(int depth); -+int str_checksum(const char *s); -+void zero_free(void *p, size_t size); -+int set_maxfiles(int requested_max); -+BOOL reg_split_key(char *full_keyname, uint32 *reg_type, char *key_name); -+int smb_mkstemp(char *template); -+void *smb_xmalloc(size_t size); -+void *smb_xmemdup(const void *p, size_t size); -+char *smb_xstrdup(const char *s); -+int smb_xvasprintf(char **ptr, const char *format, va_list ap); -+void *memdup(void *p, size_t size); -+char *myhostname(void); -+char *lock_path(char *name); -+char *pid_path(char *name); -+char *state_path(char *name); -+char *cache_path(char *name); -+char *parent_dirname(const char *path); -+BOOL ms_has_wild(char *s); -+BOOL mask_match(char *string, char *pattern, BOOL is_case_sensitive); -+BOOL unix_wild_match(char *pattern, char *string); -+DATA_BLOB data_blob(const void *p, size_t length); -+DATA_BLOB data_blob_talloc(TALLOC_CTX *mem_ctx, const void *p, size_t length); -+void data_blob_free(DATA_BLOB *d); -+void data_blob_clear(DATA_BLOB *d); -+int _Insure_trap_error(int a1, int a2, int a3, int a4, int a5, int a6); -+ -+/* The following definitions come from lib/util_file.c */ -+ -+BOOL do_file_lock(int fd, int waitsecs, int type); -+BOOL file_lock(int fd, int type, int secs, int *plock_depth); -+BOOL file_unlock(int fd, int *plock_depth); -+void *startfilepwent(char *pfile, char *s_readbuf, int bufsize, -+ int *file_lock_depth, BOOL update); -+void endfilepwent(void *vp, int *file_lock_depth); -+SMB_BIG_UINT getfilepwpos(void *vp); -+BOOL setfilepwpos(void *vp, SMB_BIG_UINT tok); -+int getfileline(void *vp, char *linebuf, int linebuf_size); -+char *fgets_slash(char *s2,int maxlen,FILE *f); -+char *file_pload(char *syscmd, size_t *size); -+char *fd_load(int fd, size_t *size); -+char *file_load(char *fname, size_t *size); -+char **file_lines_load(char *fname, int *numlines, BOOL convert); -+char **fd_lines_load(int fd, int *numlines, BOOL convert); -+char **file_lines_pload(char *syscmd, int *numlines, BOOL convert); -+void file_lines_free(char **lines); -+void file_lines_slashcont(char **lines); -+ -+/* The following definitions come from lib/util_getent.c */ -+ -+struct sys_grent * getgrent_list(void); -+void grent_free (struct sys_grent *glist); -+struct sys_pwent * getpwent_list(void); -+void pwent_free (struct sys_pwent *plist); -+struct sys_userlist *get_users_in_group(const char *gname); -+void free_userlist(struct sys_userlist *list_head); -+ -+/* The following definitions come from lib/util_seaccess.c */ -+ -+void se_map_generic(uint32 *access_mask, struct generic_mapping *mapping); -+void se_map_standard(uint32 *access_mask, struct standard_mapping *mapping); -+BOOL se_access_check(SEC_DESC *sd, NT_USER_TOKEN *token, -+ uint32 acc_desired, uint32 *acc_granted, -+ NTSTATUS *status); -+SEC_DESC_BUF *se_create_child_secdesc(TALLOC_CTX *ctx, SEC_DESC *parent_ctr, -+ BOOL child_container); -+ -+/* The following definitions come from lib/util_sec.c */ -+ -+void sec_init(void); -+uid_t sec_initial_uid(void); -+gid_t sec_initial_gid(void); -+BOOL non_root_mode(void); -+void gain_root_privilege(void); -+void gain_root_group_privilege(void); -+void set_effective_uid(uid_t uid); -+void set_effective_gid(gid_t gid); -+void save_re_uid(void); -+void restore_re_uid(void); -+int set_re_uid(void); -+void become_user_permanently(uid_t uid, gid_t gid); -+BOOL is_setuid_root(void) ; -+ -+/* The following definitions come from lib/util_sid.c */ -+ -+void generate_wellknown_sids(void); -+BOOL map_domain_sid_to_name(DOM_SID *sid, char *nt_domain); -+BOOL lookup_known_rid(DOM_SID *sid, uint32 rid, char *name, enum SID_NAME_USE *psid_name_use); -+BOOL map_domain_name_to_sid(DOM_SID *sid, char *nt_domain); -+void split_domain_name(const char *fullname, char *domain, char *name); -+char *sid_to_string(fstring sidstr_out, DOM_SID *sid); -+const char *sid_string_static(DOM_SID *sid); -+BOOL string_to_sid(DOM_SID *sidout, const char *sidstr); -+BOOL sid_append_rid(DOM_SID *sid, uint32 rid); -+BOOL sid_split_rid(DOM_SID *sid, uint32 *rid); -+BOOL sid_peek_rid(DOM_SID *sid, uint32 *rid); -+void sid_copy(DOM_SID *dst, const DOM_SID *src); -+DOM_SID *sid_dup(DOM_SID *src); -+BOOL sid_linearize(char *outbuf, size_t len, DOM_SID *sid); -+BOOL sid_parse(char *inbuf, size_t len, DOM_SID *sid); -+int sid_compare_auth(const DOM_SID *sid1, const DOM_SID *sid2); -+int sid_compare(const DOM_SID *sid1, const DOM_SID *sid2); -+int sid_compare_domain(const DOM_SID *sid1, const DOM_SID *sid2); -+BOOL sid_equal(const DOM_SID *sid1, const DOM_SID *sid2); -+BOOL sid_check_is_domain(const DOM_SID *sid); -+BOOL sid_check_is_builtin(const DOM_SID *sid); -+BOOL sid_check_is_in_our_domain(const DOM_SID *sid); -+BOOL sid_check_is_in_builtin(const DOM_SID *sid); -+size_t sid_size(DOM_SID *sid); -+BOOL non_mappable_sid(DOM_SID *sid); -+char *sid_binstring(DOM_SID *sid); -+ -+/* The following definitions come from lib/util_sock.c */ - --int cli_send_mailslot(int dgram_sock, BOOL unique, char *mailslot, -- char *buf, int len, -- const char *srcname, int src_type, -- const char *dstname, int dest_type, -- struct in_addr dest_ip, struct in_addr src_ip, -- int dest_port, int src_port); --int cli_get_response(int dgram_sock, BOOL unique, char *mailslot, char *buf, int bufsiz); --int cli_get_backup_list(const char *myname, const char *send_to_name); --int cli_get_backup_server(char *my_name, char *target, char *servername, int namesize); -+BOOL is_a_socket(int fd); -+void set_socket_options(int fd, char *options); -+ssize_t read_udp_socket(int fd,char *buf,size_t len); -+ssize_t read_with_timeout(int fd,char *buf,size_t mincnt,size_t maxcnt,unsigned int time_out); -+BOOL send_keepalive(int client); -+ssize_t read_data(int fd,char *buffer,size_t N); -+ssize_t write_data(int fd,char *buffer,size_t N); -+ssize_t write_socket_data(int fd,char *buffer,size_t N); -+ssize_t write_socket(int fd,char *buf,size_t len); -+ssize_t read_smb_length(int fd,char *inbuf,unsigned int timeout); -+BOOL receive_smb(int fd,char *buffer, unsigned int timeout); -+BOOL client_receive_smb(int fd,char *buffer, unsigned int timeout); -+BOOL send_smb(int fd,char *buffer); -+BOOL send_one_packet(char *buf,int len,struct in_addr ip,int port,int type); -+int open_socket_in( int type, int port, int dlevel, uint32 socket_addr, BOOL rebind ); -+int open_socket_out(int type, struct in_addr *addr, int port ,int timeout); -+void client_setfd(int fd); -+char *client_name(void); -+char *client_addr(void); -+char *get_socket_name(int fd); -+char *get_socket_addr(int fd); -+int create_pipe_sock(const char *socket_dir, -+ const char *socket_name, -+ mode_t dir_perms); -+int sock_exec(const char *prog); - --/* The following definitions come from libsmb/clientgen.c */ -+/* The following definitions come from lib/util_str.c */ - --int cli_set_port(struct cli_state *cli, int port); --BOOL cli_receive_smb(struct cli_state *cli); --BOOL cli_send_smb(struct cli_state *cli); --void cli_setup_packet(struct cli_state *cli); --void cli_setup_bcc(struct cli_state *cli, void *p); --void cli_init_creds(struct cli_state *cli, const struct ntuser_creds *usr); --struct cli_state *cli_initialise(struct cli_state *cli); --void cli_shutdown(struct cli_state *cli); --void cli_sockopt(struct cli_state *cli, char *options); --uint16 cli_setpid(struct cli_state *cli, uint16 pid); -+void set_first_token(char *ptr); -+BOOL next_token(char **ptr,char *buff,char *sep, size_t bufsize); -+char **toktocliplist(int *ctok, char *sep); -+int StrCaseCmp(const char *s, const char *t); -+int StrnCaseCmp(const char *s, const char *t, size_t n); -+BOOL strequal(const char *s1, const char *s2); -+BOOL strnequal(const char *s1,const char *s2,size_t n); -+BOOL strcsequal(const char *s1,const char *s2); -+int strwicmp(char *psz1, char *psz2); -+void strlower(char *s); -+void strupper(char *s); -+void strnorm(char *s); -+BOOL strisnormal(char *s); -+void string_replace(char *s,char oldc,char newc); -+char *skip_string(char *buf,size_t n); -+size_t str_charnum(const char *s); -+BOOL trim_string(char *s,const char *front,const char *back); -+BOOL strhasupper(const char *s); -+BOOL strhaslower(const char *s); -+size_t count_chars(const char *s,char c); -+BOOL str_is_all(const char *s,char c); -+char *safe_strcpy(char *dest,const char *src, size_t maxlength); -+char *safe_strcat(char *dest, const char *src, size_t maxlength); -+char *alpha_strcpy(char *dest, const char *src, const char *other_safe_chars, size_t maxlength); -+char *StrnCpy(char *dest,const char *src,size_t n); -+char *strncpyn(char *dest, const char *src,size_t n, char c); -+size_t strhex_to_str(char *p, size_t len, const char *strhex); -+BOOL in_list(char *s,char *list,BOOL casesensitive); -+void string_free(char **s); -+BOOL string_set(char **dest,const char *src); -+void string_sub(char *s,const char *pattern,const char *insert, size_t len); -+void fstring_sub(char *s,const char *pattern,const char *insert); -+void pstring_sub(char *s,const char *pattern,const char *insert); -+void all_string_sub(char *s,const char *pattern,const char *insert, size_t len); -+void split_at_last_component(char *path, char *front, char sep, char *back); -+char *octal_string(int i); -+char *string_truncate(char *s, int length); -+char *binary_string(char *buf, int len); - --/* The following definitions come from libsmb/clierror.c */ -+/* The following definitions come from lib/util_unistr.c */ - --char *cli_errstr(struct cli_state *cli); --NTSTATUS cli_nt_error(struct cli_state *cli); --void cli_dos_error(struct cli_state *cli, uint8 *eclass, uint32 *ecode); --int cli_errno_from_dos(uint8 eclass, uint32 num); --int cli_errno_from_nt(NTSTATUS status); --int cli_errno(struct cli_state *cli); --BOOL cli_is_error(struct cli_state *cli); --BOOL cli_is_nt_error(struct cli_state *cli); --BOOL cli_is_dos_error(struct cli_state *cli); -+size_t unix_PutUniCode(char *dst,const char *src, ssize_t len, BOOL null_terminate); -+size_t dos_PutUniCode(char *dst,const char *src, ssize_t len, BOOL null_terminate); -+void unistr_to_dos(char *dest, const char *src, size_t len); -+char *skip_unibuf(char *src, size_t len); -+char *dos_unistrn2(uint16 *src, int len); -+char *dos_unistr2(uint16 *src); -+char *dos_unistr2_to_str(UNISTR2 *str); -+void ascii_to_unistr(uint16 *dest, const char *src, int maxlen); -+void unistr_to_ascii(char *dest, const uint16 *src, int len); -+void unistr2_to_ascii(char *dest, const UNISTR2 *str, size_t maxlen); -+char *unistr2_tdup(TALLOC_CTX *ctx, const UNISTR2 *str); -+uint32 buffer2_to_uint32(BUFFER2 *str); -+char *dos_buffer2_to_str(BUFFER2 *str); -+char *dos_buffer2_to_multistr(BUFFER2 *str); -+size_t dos_struni2(char *dst, const char *src, size_t max_len); -+char *dos_unistr(char *buf); -+int unistrlen(uint16 *s); -+int unistrcpy(uint16 *dst, uint16 *src); -+void default_unicode_map(smb_ucs2_t **pp_cp_to_ucs2, uint16 **pp_ucs2_to_cp); -+BOOL load_unicode_map(const char *codepage, smb_ucs2_t **pp_cp_to_ucs2, uint16 **pp_ucs2_to_cp); -+BOOL load_dos_unicode_map(int codepage); -+BOOL load_unix_unicode_map(const char *unix_char_set, BOOL override); -+smb_ucs2_t *multibyte_to_unicode(smb_ucs2_t *dst, const char *src, -+ size_t dst_len, smb_ucs2_t *cp_to_ucs2); -+char *unicode_to_unix(char *dst, const smb_ucs2_t *src, size_t dst_len); -+smb_ucs2_t *unix_to_unicode(smb_ucs2_t *dst, const char *src, size_t dst_len); -+size_t unicode_to_unix_char(char *dst, const smb_ucs2_t src); -+char *unicode_to_dos(char *dst, const smb_ucs2_t *src, size_t dst_len); -+size_t unicode_to_dos_char(char *dst, const smb_ucs2_t src); -+smb_ucs2_t *dos_to_unicode(smb_ucs2_t *dst, const char *src, size_t dst_len); -+size_t strlen_w(const smb_ucs2_t *src); -+smb_ucs2_t *safe_strcpy_w(smb_ucs2_t *dest,const smb_ucs2_t *src, size_t maxlength); -+smb_ucs2_t *safe_strcat_w(smb_ucs2_t *dest, const smb_ucs2_t *src, size_t maxlength); -+int strcmp_w(const smb_ucs2_t *s1, const smb_ucs2_t *s2); -+int strncmp_w(const smb_ucs2_t *s1, const smb_ucs2_t *s2, size_t len); -+smb_ucs2_t *strstr_w(const smb_ucs2_t *s1, const smb_ucs2_t *s2); -+smb_ucs2_t *strchr_w(const smb_ucs2_t *s, smb_ucs2_t c); -+smb_ucs2_t *strrchr_w(const smb_ucs2_t *s, smb_ucs2_t c); -+smb_ucs2_t *strtok_w(smb_ucs2_t *s1, const smb_ucs2_t *s2); -+smb_ucs2_t *strdup_w(const smb_ucs2_t *s); -+int isupper_w( smb_ucs2_t val); -+int islower_w( smb_ucs2_t val); -+int isdigit_w( smb_ucs2_t val); -+int isxdigit_w( smb_ucs2_t val); -+int isspace_w( smb_ucs2_t val); -+smb_ucs2_t toupper_w( smb_ucs2_t val ); -+smb_ucs2_t tolower_w( smb_ucs2_t val ); -+void set_first_token_w(smb_ucs2_t *ptr); -+BOOL next_token_w(smb_ucs2_t **ptr, smb_ucs2_t *buff, smb_ucs2_t *sep, size_t bufsize); -+smb_ucs2_t **toktocliplist_w(int *ctok, smb_ucs2_t *sep); -+int StrCaseCmp_w(const smb_ucs2_t *s, const smb_ucs2_t *t); -+int StrnCaseCmp_w(const smb_ucs2_t *s, const smb_ucs2_t *t, size_t n); -+BOOL strequal_w(const smb_ucs2_t *s1, const smb_ucs2_t *s2); -+BOOL strnequal_w(const smb_ucs2_t *s1,const smb_ucs2_t *s2,size_t n); -+BOOL strcsequal_w(const smb_ucs2_t *s1,const smb_ucs2_t *s2); -+void strlower_w(smb_ucs2_t *s); -+void strupper_w(smb_ucs2_t *s); -+void strnorm_w(smb_ucs2_t *s); -+BOOL strisnormal_w(smb_ucs2_t *s); -+void string_replace_w(smb_ucs2_t *s, smb_ucs2_t oldc, smb_ucs2_t newc); -+smb_ucs2_t *skip_string_w(smb_ucs2_t *buf,size_t n); -+size_t str_charnum_w(const smb_ucs2_t *s); -+BOOL trim_string_w(smb_ucs2_t *s,const smb_ucs2_t *front,const smb_ucs2_t *back); -+BOOL strhasupper_w(const smb_ucs2_t *s); -+BOOL strhaslower_w(const smb_ucs2_t *s); -+size_t count_chars_w(const smb_ucs2_t *s,smb_ucs2_t c); -+BOOL str_is_all_w(const smb_ucs2_t *s,smb_ucs2_t c); -+smb_ucs2_t *alpha_strcpy_w(smb_ucs2_t *dest, const smb_ucs2_t *src, const smb_ucs2_t *other_safe_chars, size_t maxlength); -+smb_ucs2_t *StrnCpy_w(smb_ucs2_t *dest,const smb_ucs2_t *src,size_t n); -+smb_ucs2_t *strncpyn_w(smb_ucs2_t *dest, const smb_ucs2_t *src,size_t n, smb_ucs2_t c); -+size_t strhex_to_str_w(char *p, size_t len, const smb_ucs2_t *strhex); -+BOOL in_list_w(smb_ucs2_t *s,smb_ucs2_t *list,BOOL casesensitive); -+BOOL string_init_w(smb_ucs2_t **dest,const smb_ucs2_t *src); -+void string_free_w(smb_ucs2_t **s); -+BOOL string_set_w(smb_ucs2_t **dest,const smb_ucs2_t *src); -+void string_sub_w(smb_ucs2_t *s,const smb_ucs2_t *pattern,const smb_ucs2_t *insert, size_t len); -+void fstring_sub_w(smb_ucs2_t *s,const smb_ucs2_t *pattern,const smb_ucs2_t *insert); -+void pstring_sub_w(smb_ucs2_t *s,const smb_ucs2_t *pattern,smb_ucs2_t *insert); -+void all_string_sub_w(smb_ucs2_t *s,const smb_ucs2_t *pattern,const smb_ucs2_t *insert, size_t len); -+void split_at_last_component_w(smb_ucs2_t *path, smb_ucs2_t *front, smb_ucs2_t sep, smb_ucs2_t *back); -+smb_ucs2_t *octal_string_w(int i); -+smb_ucs2_t *string_truncate_w(smb_ucs2_t *s, size_t length); -+smb_ucs2_t doscp2ucs2(int w); -+int ucs2doscp(smb_ucs2_t w); -+int rpcstr_pull(char* dest, void *src, int dest_len, int src_len, int flags); - --/* The following definitions come from libsmb/clifile.c */ -+/* The following definitions come from lib/wins_srv.c */ - --uint32 unix_perms_to_wire(mode_t perms); --BOOL cli_unix_symlink(struct cli_state *cli, const char *fname_src, const char *fname_dst); --BOOL cli_unix_hardlink(struct cli_state *cli, const char *fname_src, const char *fname_dst); --BOOL cli_unix_chmod(struct cli_state *cli, const char *fname, mode_t mode); --BOOL cli_unix_chown(struct cli_state *cli, const char *fname, uid_t uid, gid_t gid); --BOOL cli_rename(struct cli_state *cli, const char *fname_src, const char *fname_dst); --BOOL cli_unlink(struct cli_state *cli, const char *fname); --BOOL cli_mkdir(struct cli_state *cli, const char *dname); --BOOL cli_rmdir(struct cli_state *cli, const char *dname); --int cli_nt_delete_on_close(struct cli_state *cli, int fnum, BOOL flag); --int cli_nt_create_full(struct cli_state *cli, const char *fname, uint32 DesiredAccess, -- uint32 FileAttributes, uint32 ShareAccess, -- uint32 CreateDisposition, uint32 CreateOptions); --int cli_nt_create(struct cli_state *cli, const char *fname, uint32 DesiredAccess); --int cli_open(struct cli_state *cli, const char *fname, int flags, int share_mode); --BOOL cli_close(struct cli_state *cli, int fnum); --NTSTATUS cli_locktype(struct cli_state *cli, int fnum, -- uint32 offset, uint32 len, int timeout, unsigned char locktype); --BOOL cli_lock(struct cli_state *cli, int fnum, -- uint32 offset, uint32 len, int timeout, enum brl_type lock_type); --BOOL cli_unlock(struct cli_state *cli, int fnum, uint32 offset, uint32 len); --BOOL cli_lock64(struct cli_state *cli, int fnum, -- SMB_BIG_UINT offset, SMB_BIG_UINT len, int timeout, enum brl_type lock_type); --BOOL cli_unlock64(struct cli_state *cli, int fnum, SMB_BIG_UINT offset, SMB_BIG_UINT len); --BOOL cli_getattrE(struct cli_state *cli, int fd, -- uint16 *attr, size_t *size, -- time_t *c_time, time_t *a_time, time_t *m_time); --BOOL cli_getatr(struct cli_state *cli, const char *fname, -- uint16 *attr, size_t *size, time_t *t); --BOOL cli_setatr(struct cli_state *cli, const char *fname, uint16 attr, time_t t); --BOOL cli_chkpath(struct cli_state *cli, const char *path); --BOOL cli_dskattr(struct cli_state *cli, int *bsize, int *total, int *avail); --int cli_ctemp(struct cli_state *cli, const char *path, char **tmp_path); -+BOOL wins_srv_load_list( char *src ); -+struct in_addr wins_srv_ip( void ); -+void wins_srv_died( struct in_addr boothill_ip ); -+unsigned long wins_srv_count( void ); - --/* The following definitions come from libsmb/clilist.c */ -+/* The following definitions come from libsmb/cli_dfs.c */ - --int cli_list_new(struct cli_state *cli,const char *Mask,uint16 attribute, -- void (*fn)(file_info *, const char *, void *), void *state); --int cli_list_old(struct cli_state *cli,const char *Mask,uint16 attribute, -- void (*fn)(file_info *, const char *, void *), void *state); --int cli_list(struct cli_state *cli,const char *Mask,uint16 attribute, -- void (*fn)(file_info *, const char *, void *), void *state); -+struct cli_state *cli_dfs_initialise(struct cli_state *cli, char *system_name, -+ struct ntuser_creds *creds); -+NTSTATUS cli_dfs_exist(struct cli_state *cli, TALLOC_CTX *mem_ctx, -+ BOOL *dfs_exists); -+NTSTATUS cli_dfs_add(struct cli_state *cli, TALLOC_CTX *mem_ctx, -+ char *entrypath, char *servername, char *sharename, -+ char *comment, uint32 flags); -+NTSTATUS cli_dfs_remove(struct cli_state *cli, TALLOC_CTX *mem_ctx, -+ char *entrypath, char *servername, char *sharename); -+NTSTATUS cli_dfs_get_info(struct cli_state *cli, TALLOC_CTX *mem_ctx, -+ char *entrypath, char *servername, char *sharename, -+ uint32 info_level, DFS_INFO_CTR *ctr); -+NTSTATUS cli_dfs_enum(struct cli_state *cli, TALLOC_CTX *mem_ctx, -+ uint32 info_level, DFS_INFO_CTR *ctr); - - /* The following definitions come from libsmb/cli_lsarpc.c */ - -@@ -355,13 +871,6 @@ - SEC_DESC_BUF **psdb); - BOOL fetch_domain_sid( char *domain, char *remote_machine, DOM_SID *psid); - --/* The following definitions come from libsmb/climessage.c */ -- --BOOL cli_message_start(struct cli_state *cli, char *host, char *username, -- int *grp); --BOOL cli_message_text(struct cli_state *cli, char *msg, int len, int grp); --BOOL cli_message_end(struct cli_state *cli, int grp); -- - /* The following definitions come from libsmb/cli_netlogon.c */ - - struct cli_state *cli_netlogon_initialise(struct cli_state *cli, -@@ -395,12 +904,6 @@ - DATA_BLOB lm_response, DATA_BLOB nt_response, - NET_USER_INFO_3 *info3); - --/* The following definitions come from libsmb/clioplock.c */ -- --BOOL cli_oplock_ack(struct cli_state *cli, int fnum, unsigned char level); --void cli_oplock_handler(struct cli_state *cli, -- BOOL (*handler)(struct cli_state *, int, unsigned char)); -- - /* The following definitions come from libsmb/cli_pipe_util.c */ - - struct cli_state *cli_pipe_initialise(struct cli_state *cli, char *system_name, -@@ -408,56 +911,6 @@ - struct ntuser_creds *creds); - void cli_pipe_shutdown(struct cli_state *cli); - --/* The following definitions come from libsmb/cliprint.c */ -- --int cli_print_queue(struct cli_state *cli, -- void (*fn)(struct print_job_info *)); --int cli_printjob_del(struct cli_state *cli, int job); -- --/* The following definitions come from libsmb/clirap.c */ -- --BOOL cli_api_pipe(struct cli_state *cli, char *pipe_name, -- uint16 *setup, uint32 setup_count, uint32 max_setup_count, -- char *params, uint32 param_count, uint32 max_param_count, -- char *data, uint32 data_count, uint32 max_data_count, -- char **rparam, uint32 *rparam_count, -- char **rdata, uint32 *rdata_count); --BOOL cli_api(struct cli_state *cli, -- char *param, int prcnt, int mprcnt, -- char *data, int drcnt, int mdrcnt, -- char **rparam, int *rprcnt, -- char **rdata, int *rdrcnt); --BOOL cli_NetWkstaUserLogon(struct cli_state *cli,char *user, char *workstation); --int cli_RNetShareEnum(struct cli_state *cli, void (*fn)(const char *, uint32, const char *, void *), void *state); --BOOL cli_NetServerEnum(struct cli_state *cli, char *workgroup, uint32 stype, -- void (*fn)(const char *, uint32, const char *, void *), -- void *state); --BOOL cli_oem_change_password(struct cli_state *cli, const char *user, const char *new_password, -- const char *old_password); --BOOL cli_qpathinfo(struct cli_state *cli, const char *fname, -- time_t *c_time, time_t *a_time, time_t *m_time, -- size_t *size, uint16 *mode); --BOOL cli_qpathinfo2(struct cli_state *cli, const char *fname, -- time_t *c_time, time_t *a_time, time_t *m_time, -- time_t *w_time, size_t *size, uint16 *mode, -- SMB_INO_T *ino); --BOOL cli_qfileinfo(struct cli_state *cli, int fnum, -- uint16 *mode, size_t *size, -- time_t *c_time, time_t *a_time, time_t *m_time, -- time_t *w_time, SMB_INO_T *ino); --BOOL cli_qfileinfo_test(struct cli_state *cli, int fnum, int level, char *outdata); --NTSTATUS cli_qpathinfo_alt_name(struct cli_state *cli, const char *fname, fstring alt_name); -- --/* The following definitions come from libsmb/clireadwrite.c */ -- --ssize_t cli_read(struct cli_state *cli, int fnum, char *buf, off_t offset, size_t size); --ssize_t cli_readraw(struct cli_state *cli, int fnum, char *buf, off_t offset, size_t size); --ssize_t cli_write(struct cli_state *cli, -- int fnum, uint16 write_mode, -- char *buf, off_t offset, size_t size); --ssize_t cli_smbwrite(struct cli_state *cli, -- int fnum, char *buf, off_t offset, size_t size1); -- - /* The following definitions come from libsmb/cli_reg.c */ - - struct cli_state *cli_winreg_initialise(struct cli_state *cli, -@@ -546,12 +999,6 @@ - POLICY_HND *user_pol, uint16 switch_value, - TALLOC_CTX *ctx, SEC_DESC_BUF **sec_desc_buf); - --/* The following definitions come from libsmb/clisecdesc.c */ -- --SEC_DESC *cli_query_secdesc(struct cli_state *cli, int fnum, -- TALLOC_CTX *mem_ctx); --BOOL cli_set_secdesc(struct cli_state *cli, int fnum, SEC_DESC *sd); -- - /* The following definitions come from libsmb/cli_spoolss.c */ - - struct cli_state *cli_spoolss_initialise(struct cli_state *cli, -@@ -632,805 +1079,360 @@ - TALLOC_CTX *mem_ctx, - uint32 switch_value, SRV_INFO_CTR *ctr); - --/* The following definitions come from libsmb/clistr.c */ -- --int clistr_push(struct cli_state *cli, void *dest, const char *src, int dest_len, int flags); --int clistr_pull(struct cli_state *cli, char *dest, const void *src, int dest_len, int src_len, int flags); --int clistr_align_out(struct cli_state *cli, const void *p, int flags); --int clistr_align_in(struct cli_state *cli, const void *p, int flags); -- --/* The following definitions come from libsmb/clitrans.c */ -- --BOOL cli_send_trans(struct cli_state *cli, int trans, -- const char *pipe_name, -- int fid, int flags, -- uint16 *setup, int lsetup, int msetup, -- char *param, int lparam, int mparam, -- char *data, int ldata, int mdata); --BOOL cli_receive_trans(struct cli_state *cli,int trans, -- char **param, int *param_len, -- char **data, int *data_len); --BOOL cli_send_nt_trans(struct cli_state *cli, -- int function, -- int flags, -- uint16 *setup, int lsetup, int msetup, -- char *param, int lparam, int mparam, -- char *data, int ldata, int mdata); --BOOL cli_receive_nt_trans(struct cli_state *cli, -- char **param, int *param_len, -- char **data, int *data_len); -- --/* The following definitions come from libsmb/credentials.c */ -- --char *credstr(const uchar *cred); --void cred_session_key(const DOM_CHAL *clnt_chal, const DOM_CHAL *srv_chal, const uchar *pass, -- uchar session_key[8]); --void cred_create(uchar session_key[8], DOM_CHAL *stor_cred, UTIME timestamp, -- DOM_CHAL *cred); --int cred_assert(DOM_CHAL *cred, uchar session_key[8], DOM_CHAL *stored_cred, -- UTIME timestamp); --BOOL clnt_deal_with_creds(uchar sess_key[8], -- DOM_CRED *sto_clnt_cred, DOM_CRED *rcv_srv_cred); --BOOL deal_with_creds(uchar sess_key[8], -- DOM_CRED *sto_clnt_cred, -- DOM_CRED *rcv_clnt_cred, DOM_CRED *rtn_srv_cred); -- --/* The following definitions come from libsmb/doserr.c */ -- --char *dos_errstr(WERROR werror); -- --/* The following definitions come from libsmb/errormap.c */ -- --NTSTATUS dos_to_ntstatus(int eclass, int ecode); --void ntstatus_to_dos(NTSTATUS ntstatus, uint8 *eclass, uint32 *ecode); --NTSTATUS werror_to_ntstatus(WERROR error); --WERROR ntstatus_to_werror(NTSTATUS error); -- --/* The following definitions come from libsmb/namequery.c */ -- --struct node_status *node_status_query(int fd,struct nmb_name *name, -- struct in_addr to_ip, int *num_names); --BOOL name_status_find(const char *q_name, int q_type, int type, struct in_addr to_ip, char *name); --BOOL name_register(int fd, const char *name, int name_type, -- struct in_addr name_ip, int opcode, -- BOOL bcast, -- struct in_addr to_ip, int *count); --struct in_addr *name_query(int fd,const char *name,int name_type, -- BOOL bcast,BOOL recurse, -- struct in_addr to_ip, int *count); --FILE *startlmhosts(char *fname); --BOOL getlmhostsent( FILE *fp, pstring name, int *name_type, struct in_addr *ipaddr); --void endlmhosts(FILE *fp); --BOOL name_register_wins(const char *name, int name_type); --BOOL name_resolve_bcast(const char *name, int name_type, -- struct in_addr **return_ip_list, int *return_count); --BOOL resolve_name(const char *name, struct in_addr *return_ip, int name_type); --BOOL resolve_srv_name(const char* srv_name, fstring dest_host, -- struct in_addr *ip); --BOOL find_master_ip(char *group, struct in_addr *master_ip); --BOOL lookup_dc_name(const char *srcname, const char *domain, -- struct in_addr *dc_ip, char *ret_name); --BOOL get_dc_list(BOOL pdc_only, const char *group, struct in_addr **ip_list, int *count); --BOOL get_lmb_list(struct in_addr **ip_list, int *count); -- --/* The following definitions come from libsmb/nmblib.c */ -- --void debug_nmb_packet(struct packet_struct *p); --char *nmb_namestr(struct nmb_name *n); --struct packet_struct *copy_packet(struct packet_struct *packet); --void free_packet(struct packet_struct *packet); --struct packet_struct *parse_packet(char *buf,int length, -- enum packet_type packet_type); --struct packet_struct *read_packet(int fd,enum packet_type packet_type); --void make_nmb_name( struct nmb_name *n, const char *name, int type); --BOOL nmb_name_equal(struct nmb_name *n1, struct nmb_name *n2); --int build_packet(char *buf, struct packet_struct *p); --BOOL send_packet(struct packet_struct *p); --struct packet_struct *receive_packet(int fd,enum packet_type type,int t); --struct packet_struct *receive_nmb_packet(int fd, int t, int trn_id); --struct packet_struct *receive_dgram_packet(int fd, int t, char *mailslot_name); --BOOL match_mailslot_name(struct packet_struct *p, char *mailslot_name); --void sort_query_replies(char *data, int n, struct in_addr ip); --char *dns_to_netbios_name(char *dns_name); --int name_mangle( char *In, char *Out, char name_type ); --int name_extract(char *buf,int ofs,char *name); --int name_len(char *s1); -- --/* The following definitions come from libsmb/nterr.c */ -- --char *get_nt_error_msg(NTSTATUS nt_code); --char *nt_errstr(NTSTATUS nt_code); --char *get_nt_error_c_code(NTSTATUS nt_code); -- --/* The following definitions come from libsmb/passchange.c */ -- --BOOL remote_password_change(const char *remote_machine, const char *user_name, -- const char *old_passwd, const char *new_passwd, -- char *err_str, size_t err_str_len); -- --/* The following definitions come from libsmb/pwd_cache.c */ -- --void pwd_init(struct pwd_info *pwd); --BOOL pwd_is_nullpwd(const struct pwd_info *pwd); --BOOL pwd_compare(struct pwd_info *pwd1, struct pwd_info *pwd2); --void pwd_read(struct pwd_info *pwd, char *passwd_report, BOOL do_encrypt); --void pwd_set_nullpwd(struct pwd_info *pwd); --void pwd_set_cleartext(struct pwd_info *pwd, char *clr); --void pwd_get_cleartext(struct pwd_info *pwd, char *clr); --void pwd_set_lm_nt_16(struct pwd_info *pwd, uchar lm_pwd[16], uchar nt_pwd[16]); --void pwd_get_lm_nt_16(struct pwd_info *pwd, uchar lm_pwd[16], uchar nt_pwd[16]); --void pwd_make_lm_nt_16(struct pwd_info *pwd, char *clr); --void pwd_make_lm_nt_owf(struct pwd_info *pwd, uchar cryptkey[8]); --void pwd_get_lm_nt_owf(struct pwd_info *pwd, uchar lm_owf[24], uchar nt_owf[24]); -- --/* The following definitions come from lib/smbrun.c */ -- --int smbrun(char *cmd, int *outfd); -- --/* The following definitions come from libsmb/smbdes.c */ -- --void E_P16(const unsigned char *p14,unsigned char *p16); --void E_P24(const unsigned char *p21, const unsigned char *c8, unsigned char *p24); --void D_P16(const unsigned char *p14, const unsigned char *in, unsigned char *out); --void E_old_pw_hash( unsigned char *p14, const unsigned char *in, unsigned char *out); --void cred_hash1(unsigned char *out, const unsigned char *in, const unsigned char *key); --void cred_hash2(unsigned char *out, const unsigned char *in, const unsigned char *key); --void cred_hash3(unsigned char *out, unsigned char *in, const unsigned char *key, int forw); --void SamOEMhash( unsigned char *data, const unsigned char *key, int val); --void sam_pwd_hash(unsigned int rid, const uchar *in, uchar *out, int forw); -- --/* The following definitions come from libsmb/smbencrypt.c */ -+/* The following definitions come from libsmb/cliconnect.c */ - --void SMBencrypt(const uchar *passwd, uchar *c8, uchar *p24); --void E_md4hash(const uchar *passwd, uchar *p16); --void nt_lm_owf_gen(char *pwd, uchar nt_p16[16], uchar p16[16]); --void SMBOWFencrypt(uchar passwd[16], uchar *c8, uchar p24[24]); --void NTLMSSPOWFencrypt(uchar passwd[8], uchar *ntlmchalresp, uchar p24[24]); --void SMBNTencrypt(const uchar *passwd, uchar *c8, uchar *p24); --BOOL make_oem_passwd_hash(char data[516], const char *passwd, uchar old_pw_hash[16], BOOL unicode); --BOOL encode_pw_buffer(char buffer[516], const char *new_pass, -- int new_pw_len, BOOL nt_pass_set); --BOOL decode_pw_buffer(char in_buffer[516], char *new_pwrd, -- int new_pwrd_size, uint32 *new_pw_len, -- uchar nt_p16[16], uchar p16[16]); --void nt_owf_genW(const UNISTR2 *pwd, uchar nt_p16[16]); -+BOOL cli_session_setup(struct cli_state *cli, -+ char *user, -+ char *pass, int passlen, -+ char *ntpass, int ntpasslen, -+ char *workgroup); -+BOOL cli_ulogoff(struct cli_state *cli); -+BOOL cli_send_tconX(struct cli_state *cli, -+ const char *share, const char *dev, const char *pass, int passlen); -+BOOL cli_tdis(struct cli_state *cli); -+void cli_negprot_send(struct cli_state *cli); -+BOOL cli_negprot(struct cli_state *cli); -+BOOL cli_session_request(struct cli_state *cli, -+ struct nmb_name *calling, struct nmb_name *called); -+BOOL cli_connect(struct cli_state *cli, const char *host, struct in_addr *ip); -+BOOL cli_establish_connection(struct cli_state *cli, -+ char *dest_host, struct in_addr *dest_ip, -+ struct nmb_name *calling, struct nmb_name *called, -+ char *service, char *service_type, -+ BOOL do_shutdown, BOOL do_tcon); -+NTSTATUS cli_full_connection(struct cli_state **output_cli, -+ const char *my_name, const char *dest_host, -+ struct in_addr *dest_ip, int port, -+ char *service, char *service_type, -+ char *user, char *domain, -+ char *password, int pass_len) ; -+BOOL attempt_netbios_session_request(struct cli_state *cli, char *srchost, char *desthost, -+ struct in_addr *pdest_ip); - --/* The following definitions come from libsmb/smberr.c */ -+/* The following definitions come from libsmb/clidgram.c */ - --char *smb_dos_err_name(uint8 class, uint16 num); --char *get_dos_error_msg(WERROR result); --char *smb_dos_err_class(uint8 class); --char *smb_dos_errstr(char *inbuf); --WERROR map_werror_from_unix(int error); -+int cli_send_mailslot(int dgram_sock, BOOL unique, char *mailslot, -+ char *buf, int len, -+ const char *srcname, int src_type, -+ const char *dstname, int dest_type, -+ struct in_addr dest_ip, struct in_addr src_ip, -+ int dest_port, int src_port); -+int cli_get_response(int dgram_sock, BOOL unique, char *mailslot, char *buf, int bufsiz); -+int cli_get_backup_list(const char *myname, const char *send_to_name); -+int cli_get_backup_server(char *my_name, char *target, char *servername, int namesize); - --/* The following definitions come from libsmb/unexpected.c */ -+/* The following definitions come from libsmb/clientgen.c */ - --void unexpected_packet(struct packet_struct *p); --void clear_unexpected(time_t t); --struct packet_struct *receive_unexpected(enum packet_type packet_type, int id, -- char *mailslot_name); -+int cli_set_port(struct cli_state *cli, int port); -+BOOL cli_receive_smb(struct cli_state *cli); -+BOOL cli_send_smb(struct cli_state *cli); -+void cli_setup_packet(struct cli_state *cli); -+void cli_setup_bcc(struct cli_state *cli, void *p); -+void cli_init_creds(struct cli_state *cli, const struct ntuser_creds *usr); -+struct cli_state *cli_initialise(struct cli_state *cli); -+void cli_shutdown(struct cli_state *cli); -+void cli_sockopt(struct cli_state *cli, char *options); -+uint16 cli_setpid(struct cli_state *cli, uint16 pid); - --/* The following definitions come from lib/snprintf.c */ -+/* The following definitions come from libsmb/clierror.c */ - -+char *cli_errstr(struct cli_state *cli); -+NTSTATUS cli_nt_error(struct cli_state *cli); -+void cli_dos_error(struct cli_state *cli, uint8 *eclass, uint32 *ecode); -+int cli_errno_from_dos(uint8 eclass, uint32 num); -+int cli_errno_from_nt(NTSTATUS status); -+int cli_errno(struct cli_state *cli); -+BOOL cli_is_error(struct cli_state *cli); -+BOOL cli_is_nt_error(struct cli_state *cli); -+BOOL cli_is_dos_error(struct cli_state *cli); - --/* The following definitions come from lib/substitute.c */ -+/* The following definitions come from libsmb/clifile.c */ - --void standard_sub_basic(char *str); --void standard_sub_advanced(int snum, char *user, char *connectpath, gid_t gid, char *str); --void standard_sub_conn(connection_struct *conn, char *str); --void standard_sub_home(int snum, char *user, char *str); --void standard_sub_snum(int snum, char *str); --void standard_sub_vuser(char *str, user_struct *vuser); --void standard_sub_vsnum(char *str, user_struct *vuser, int snum); -+uint32 unix_perms_to_wire(mode_t perms); -+BOOL cli_unix_symlink(struct cli_state *cli, const char *fname_src, const char *fname_dst); -+BOOL cli_unix_hardlink(struct cli_state *cli, const char *fname_src, const char *fname_dst); -+BOOL cli_unix_chmod(struct cli_state *cli, const char *fname, mode_t mode); -+BOOL cli_unix_chown(struct cli_state *cli, const char *fname, uid_t uid, gid_t gid); -+BOOL cli_rename(struct cli_state *cli, const char *fname_src, const char *fname_dst); -+BOOL cli_unlink(struct cli_state *cli, const char *fname); -+BOOL cli_mkdir(struct cli_state *cli, const char *dname); -+BOOL cli_rmdir(struct cli_state *cli, const char *dname); -+int cli_nt_delete_on_close(struct cli_state *cli, int fnum, BOOL flag); -+int cli_nt_create_full(struct cli_state *cli, const char *fname, uint32 DesiredAccess, -+ uint32 FileAttributes, uint32 ShareAccess, -+ uint32 CreateDisposition, uint32 CreateOptions); -+int cli_nt_create(struct cli_state *cli, const char *fname, uint32 DesiredAccess); -+int cli_open(struct cli_state *cli, const char *fname, int flags, int share_mode); -+BOOL cli_close(struct cli_state *cli, int fnum); -+NTSTATUS cli_locktype(struct cli_state *cli, int fnum, -+ uint32 offset, uint32 len, int timeout, unsigned char locktype); -+BOOL cli_lock(struct cli_state *cli, int fnum, -+ uint32 offset, uint32 len, int timeout, enum brl_type lock_type); -+BOOL cli_unlock(struct cli_state *cli, int fnum, uint32 offset, uint32 len); -+BOOL cli_lock64(struct cli_state *cli, int fnum, -+ SMB_BIG_UINT offset, SMB_BIG_UINT len, int timeout, enum brl_type lock_type); -+BOOL cli_unlock64(struct cli_state *cli, int fnum, SMB_BIG_UINT offset, SMB_BIG_UINT len); -+BOOL cli_getattrE(struct cli_state *cli, int fd, -+ uint16 *attr, size_t *size, -+ time_t *c_time, time_t *a_time, time_t *m_time); -+BOOL cli_getatr(struct cli_state *cli, const char *fname, -+ uint16 *attr, size_t *size, time_t *t); -+BOOL cli_setatr(struct cli_state *cli, const char *fname, uint16 attr, time_t t); -+BOOL cli_chkpath(struct cli_state *cli, const char *path); -+BOOL cli_dskattr(struct cli_state *cli, int *bsize, int *total, int *avail); -+int cli_ctemp(struct cli_state *cli, const char *path, char **tmp_path); - --/* The following definitions come from lib/sysacls.c */ -+/* The following definitions come from libsmb/clilist.c */ - --int sys_acl_get_entry( SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p); --int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p); --int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p); --void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d); --SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type); --SMB_ACL_T sys_acl_get_fd(int fd); --int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset); --int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm); --int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm); --char *sys_acl_to_text( SMB_ACL_T the_acl, ssize_t *plen); --SMB_ACL_T sys_acl_init( int count); --int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry); --int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype); --int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual); --int sys_acl_set_permset( SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset); --int sys_acl_valid( SMB_ACL_T theacl ); --int sys_acl_set_file( const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl); --int sys_acl_set_fd( int fd, SMB_ACL_T theacl); --int sys_acl_delete_def_file(const char *name); --int sys_acl_free_text(char *text); --int sys_acl_free_acl(SMB_ACL_T the_acl) ; --int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype); --int sys_acl_get_entry( SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p); --int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p); --int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p); --void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d); --SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type); --SMB_ACL_T sys_acl_get_fd(int fd); --int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset); --int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm); --int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm); --char *sys_acl_to_text( SMB_ACL_T the_acl, ssize_t *plen); --SMB_ACL_T sys_acl_init( int count); --int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry); --int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype); --int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual); --int sys_acl_set_permset( SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset); --int sys_acl_valid( SMB_ACL_T theacl ); --int sys_acl_set_file( const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl); --int sys_acl_set_fd( int fd, SMB_ACL_T theacl); --int sys_acl_delete_def_file(const char *name); --int sys_acl_free_text(char *text); --int sys_acl_free_acl(SMB_ACL_T the_acl) ; --int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype); --int sys_acl_get_entry(SMB_ACL_T acl_d, int entry_id, SMB_ACL_ENTRY_T *entry_p); --int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *type_p); --int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p); --void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d); --SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type); --SMB_ACL_T sys_acl_get_fd(int fd); --int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset_d); --int sys_acl_add_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm); --int sys_acl_get_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm); --char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p); --SMB_ACL_T sys_acl_init(int count); --int sys_acl_create_entry(SMB_ACL_T *acl_p, SMB_ACL_ENTRY_T *entry_p); --int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T tag_type); --int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p); --int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d); --int sys_acl_valid(SMB_ACL_T acl_d); --int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d); --int sys_acl_set_fd(int fd, SMB_ACL_T acl_d); --int sys_acl_delete_def_file(const char *path); --int sys_acl_free_text(char *text); --int sys_acl_free_acl(SMB_ACL_T acl_d) ; --int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype); --int sys_acl_get_entry(SMB_ACL_T acl_d, int entry_id, SMB_ACL_ENTRY_T *entry_p); --int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *type_p); --int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p); --void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d); --SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type); --SMB_ACL_T sys_acl_get_fd(int fd); --int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset_d); --int sys_acl_add_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm); --int sys_acl_get_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm); --char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p); --SMB_ACL_T sys_acl_init(int count); --int sys_acl_create_entry(SMB_ACL_T *acl_p, SMB_ACL_ENTRY_T *entry_p); --int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T tag_type); --int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p); --int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d); --int sys_acl_valid(SMB_ACL_T acl_d); --int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d); --int sys_acl_set_fd(int fd, SMB_ACL_T acl_d); --int sys_acl_delete_def_file(const char *path); --int sys_acl_free_text(char *text); --int sys_acl_free_acl(SMB_ACL_T acl_d) ; --int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype); --int sys_acl_get_entry(SMB_ACL_T acl_d, int entry_id, SMB_ACL_ENTRY_T *entry_p); --int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *type_p); --int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p); --void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d); --SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type); --SMB_ACL_T sys_acl_get_fd(int fd); --int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset_d); --int sys_acl_add_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm); --int sys_acl_get_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm); --char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p); --SMB_ACL_T sys_acl_init(int count); --int sys_acl_create_entry(SMB_ACL_T *acl_p, SMB_ACL_ENTRY_T *entry_p); --int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T tag_type); --int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p); --int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d); --int sys_acl_valid(SMB_ACL_T acl_d); --int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d); --int sys_acl_set_fd(int fd, SMB_ACL_T acl_d); --int sys_acl_delete_def_file(const char *name); --int sys_acl_free_text(char *text); --int sys_acl_free_acl(SMB_ACL_T acl_d) ; --int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype); --int sys_acl_get_entry( SMB_ACL_T theacl, int entry_id, SMB_ACL_ENTRY_T *entry_p); --int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p); --int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p); --void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d); --SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type); --SMB_ACL_T sys_acl_get_fd(int fd); --int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset); --int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm); --char *sys_acl_to_text( SMB_ACL_T theacl, ssize_t *plen); --SMB_ACL_T sys_acl_init( int count); --int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry); --int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype); --int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual); --int sys_acl_set_permset( SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset); --int sys_acl_valid( SMB_ACL_T theacl ); --int sys_acl_set_file( const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl); --int sys_acl_set_fd( int fd, SMB_ACL_T theacl); --int sys_acl_delete_def_file(const char *name); --int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm); --int sys_acl_free_text(char *text); --int sys_acl_free_acl(SMB_ACL_T posix_acl); --int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype); --int sys_acl_get_entry( SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p); --int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p); --int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p); --void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d); --SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type); --SMB_ACL_T sys_acl_get_fd(int fd); --int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset); --int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm); --int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm); --char *sys_acl_to_text( SMB_ACL_T the_acl, ssize_t *plen); --int sys_acl_free_text(char *text); --SMB_ACL_T sys_acl_init( int count); --int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry); --int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype); --int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual); --int sys_acl_set_permset( SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset); --int sys_acl_valid( SMB_ACL_T theacl ); --int sys_acl_set_file( const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl); --int sys_acl_set_fd( int fd, SMB_ACL_T theacl); --int sys_acl_delete_def_file(const char *name); --int sys_acl_free_acl(SMB_ACL_T the_acl) ; --int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype); -+int cli_list_new(struct cli_state *cli,const char *Mask,uint16 attribute, -+ void (*fn)(file_info *, const char *, void *), void *state); -+int cli_list_old(struct cli_state *cli,const char *Mask,uint16 attribute, -+ void (*fn)(file_info *, const char *, void *), void *state); -+int cli_list(struct cli_state *cli,const char *Mask,uint16 attribute, -+ void (*fn)(file_info *, const char *, void *), void *state); - --/* The following definitions come from lib/system.c */ -+/* The following definitions come from libsmb/climessage.c */ - --int sys_usleep(long usecs); --ssize_t sys_read(int fd, void *buf, size_t count); --ssize_t sys_write(int fd, const void *buf, size_t count); --ssize_t sys_send(int s, const void *msg, size_t len, int flags); --ssize_t sys_sendto(int s, const void *msg, size_t len, int flags, const struct sockaddr *to, socklen_t tolen); --ssize_t sys_recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlen); --int sys_fcntl_ptr(int fd, int cmd, void *arg); --int sys_fcntl_long(int fd, int cmd, long arg); --int sys_stat(const char *fname,SMB_STRUCT_STAT *sbuf); --int sys_fstat(int fd,SMB_STRUCT_STAT *sbuf); --int sys_lstat(const char *fname,SMB_STRUCT_STAT *sbuf); --int sys_ftruncate(int fd, SMB_OFF_T offset); --SMB_OFF_T sys_lseek(int fd, SMB_OFF_T offset, int whence); --int sys_fseek(FILE *fp, SMB_OFF_T offset, int whence); --SMB_OFF_T sys_ftell(FILE *fp); --int sys_creat(const char *path, mode_t mode); --int sys_open(const char *path, int oflag, mode_t mode); --FILE *sys_fopen(const char *path, const char *type); --SMB_STRUCT_DIRENT *sys_readdir(DIR *dirp); --int sys_mknod(const char *path, mode_t mode, SMB_DEV_T dev); --char *sys_realpath(const char *path, char *resolved_path); --int sys_waitpid(pid_t pid,int *status,int options); --char *sys_getwd(char *s); --int sys_symlink(const char *oldpath, const char *newpath); --int sys_readlink(const char *path, char *buf, size_t bufsiz); --int sys_link(const char *oldpath, const char *newpath); --int sys_chown(const char *fname,uid_t uid,gid_t gid); --int sys_chroot(const char *dname); --struct hostent *sys_gethostbyname(const char *name); --void oplock_set_capability(BOOL this_process, BOOL inherit); --long sys_random(void); --void sys_srandom(unsigned int seed); --int groups_max(void); --int sys_getgroups(int setlen, gid_t *gidset); --int sys_setgroups(int setlen, gid_t *gidset); --void sys_setpwent(void); --struct passwd *sys_getpwent(void); --void sys_endpwent(void); --struct passwd *sys_getpwnam(const char *name); --struct passwd *sys_getpwuid(uid_t uid); --int wsys_stat(const smb_ucs2_t *wfname,SMB_STRUCT_STAT *sbuf); --int wsys_lstat(const smb_ucs2_t *wfname,SMB_STRUCT_STAT *sbuf); --int wsys_creat(const smb_ucs2_t *wfname, mode_t mode); --int wsys_open(const smb_ucs2_t *wfname, int oflag, mode_t mode); --FILE *wsys_fopen(const smb_ucs2_t *wfname, const char *type); --DIR *wsys_opendir(const smb_ucs2_t *wfname); --smb_ucs2_t *wsys_getwd(smb_ucs2_t *s); --int wsys_chown(const smb_ucs2_t *wfname, uid_t uid, gid_t gid); --int wsys_chroot(const smb_ucs2_t *wfname); --pid_t sys_fork(void); --pid_t sys_getpid(void); --int sys_popen(const char *command); --int sys_pclose(int fd); --void *sys_dlopen(const char *name, int flags); --void *sys_dlsym(void *handle, char *symbol); --int sys_dlclose (void *handle); --const char *sys_dlerror(void); --void sys_adminlog(int priority, const char *format_str, ...); -+BOOL cli_message_start(struct cli_state *cli, char *host, char *username, -+ int *grp); -+BOOL cli_message_text(struct cli_state *cli, char *msg, int len, int grp); -+BOOL cli_message_end(struct cli_state *cli, int grp); - --/* The following definitions come from lib/talloc.c */ -+/* The following definitions come from libsmb/clioplock.c */ - --TALLOC_CTX *talloc_init(void); --void *talloc(TALLOC_CTX *t, size_t size); --void *talloc_realloc(TALLOC_CTX *t, void *ptr, size_t size); --void talloc_destroy_pool(TALLOC_CTX *t); --void talloc_destroy(TALLOC_CTX *t); --size_t talloc_pool_size(TALLOC_CTX *t); --const char * talloc_pool_name(TALLOC_CTX const *t); --void *talloc_zero(TALLOC_CTX *t, size_t size); --void *talloc_memdup(TALLOC_CTX *t, const void *p, size_t size); --char *talloc_strdup(TALLOC_CTX *t, const char *p); --char *talloc_describe_all(TALLOC_CTX *rt); --void talloc_get_allocation(TALLOC_CTX *t, -- size_t *total_bytes, -- int *n_chunks); -+BOOL cli_oplock_ack(struct cli_state *cli, int fnum, unsigned char level); -+void cli_oplock_handler(struct cli_state *cli, -+ BOOL (*handler)(struct cli_state *, int, unsigned char)); - --/* The following definitions come from lib/time.c */ -+/* The following definitions come from libsmb/cliprint.c */ - --time_t get_time_t_min(void); --time_t get_time_t_max(void); --void GetTimeOfDay(struct timeval *tval); --void TimeInit(void); --void get_process_uptime(struct timeval *ret_time); --int TimeDiff(time_t t); --struct tm *LocalTime(time_t *t); --time_t nt_time_to_unix(NTTIME *nt); --time_t nt_time_to_unix_abs(NTTIME *nt); --time_t interpret_long_date(char *p); --void unix_to_nt_time(NTTIME *nt, time_t t); --void unix_to_nt_time_abs(NTTIME *nt, time_t t); --void put_long_date(char *p,time_t t); --BOOL null_mtime(time_t mtime); --void put_dos_date(char *buf,int offset,time_t unixdate); --void put_dos_date2(char *buf,int offset,time_t unixdate); --void put_dos_date3(char *buf,int offset,time_t unixdate); --time_t make_unix_date(void *date_ptr); --time_t make_unix_date2(void *date_ptr); --time_t make_unix_date3(void *date_ptr); --char *http_timestring(time_t t); --char *timestring(BOOL hires); --time_t get_create_time(SMB_STRUCT_STAT *st,BOOL fake_dirs); --void init_nt_time(NTTIME *nt); -+int cli_print_queue(struct cli_state *cli, -+ void (*fn)(struct print_job_info *)); -+int cli_printjob_del(struct cli_state *cli, int job); - --/* The following definitions come from lib/ufc.c */ -+/* The following definitions come from libsmb/clirap.c */ - --char *ufc_crypt(const char *key,const char *salt); -+BOOL cli_api_pipe(struct cli_state *cli, char *pipe_name, -+ uint16 *setup, uint32 setup_count, uint32 max_setup_count, -+ char *params, uint32 param_count, uint32 max_param_count, -+ char *data, uint32 data_count, uint32 max_data_count, -+ char **rparam, uint32 *rparam_count, -+ char **rdata, uint32 *rdata_count); -+BOOL cli_api(struct cli_state *cli, -+ char *param, int prcnt, int mprcnt, -+ char *data, int drcnt, int mdrcnt, -+ char **rparam, int *rprcnt, -+ char **rdata, int *rdrcnt); -+BOOL cli_NetWkstaUserLogon(struct cli_state *cli,char *user, char *workstation); -+int cli_RNetShareEnum(struct cli_state *cli, void (*fn)(const char *, uint32, const char *, void *), void *state); -+BOOL cli_NetServerEnum(struct cli_state *cli, char *workgroup, uint32 stype, -+ void (*fn)(const char *, uint32, const char *, void *), -+ void *state); -+BOOL cli_oem_change_password(struct cli_state *cli, const char *user, const char *new_password, -+ const char *old_password); -+BOOL cli_qpathinfo(struct cli_state *cli, const char *fname, -+ time_t *c_time, time_t *a_time, time_t *m_time, -+ size_t *size, uint16 *mode); -+BOOL cli_qpathinfo2(struct cli_state *cli, const char *fname, -+ time_t *c_time, time_t *a_time, time_t *m_time, -+ time_t *w_time, size_t *size, uint16 *mode, -+ SMB_INO_T *ino); -+BOOL cli_qfileinfo(struct cli_state *cli, int fnum, -+ uint16 *mode, size_t *size, -+ time_t *c_time, time_t *a_time, time_t *m_time, -+ time_t *w_time, SMB_INO_T *ino); -+BOOL cli_qfileinfo_test(struct cli_state *cli, int fnum, int level, char *outdata); -+NTSTATUS cli_qpathinfo_alt_name(struct cli_state *cli, const char *fname, fstring alt_name); - --/* The following definitions come from lib/username.c */ -+/* The following definitions come from libsmb/clireadwrite.c */ - --BOOL name_is_local(const char *name); --char *get_user_home_dir(char *user); --char *get_user_service_home_dir(char *user); --BOOL map_username(char *user); --struct passwd *Get_Pwnam(char *user,BOOL allow_change); --BOOL user_in_group_list(char *user,char *gname); --BOOL user_in_list(char *user,char *list); --struct passwd *smb_getpwnam(char *user, BOOL allow_change); -+ssize_t cli_read(struct cli_state *cli, int fnum, char *buf, off_t offset, size_t size); -+ssize_t cli_readraw(struct cli_state *cli, int fnum, char *buf, off_t offset, size_t size); -+ssize_t cli_write(struct cli_state *cli, -+ int fnum, uint16 write_mode, -+ char *buf, off_t offset, size_t size); -+ssize_t cli_smbwrite(struct cli_state *cli, -+ int fnum, char *buf, off_t offset, size_t size1); - --/* The following definitions come from lib/util.c */ -+/* The following definitions come from libsmb/clisecdesc.c */ - --char *tmpdir(void); --BOOL in_group(gid_t group, gid_t current_gid, int ngroups, gid_t *groups); --char *Atoic(char *p, int *n, char *c); --char *get_numlist(char *p, uint32 **num, int *count); --BOOL file_exist(char *fname,SMB_STRUCT_STAT *sbuf); --time_t file_modtime(char *fname); --BOOL directory_exist(char *dname,SMB_STRUCT_STAT *st); --SMB_OFF_T get_file_size(char *file_name); --char *attrib_string(uint16 mode); --void show_msg(char *buf); --void smb_setlen(char *buf,int len); --int set_message(char *buf,int num_words,int num_bytes,BOOL zero); --int set_message_bcc(char *buf,int num_bytes); --int set_message_end(void *outbuf,void *end_ptr); --void dos_clean_name(char *s); --void unix_clean_name(char *s); --void make_dir_struct(char *buf,char *mask,char *fname,SMB_OFF_T size,int mode,time_t date); --void close_low_fds(void); --int set_blocking(int fd, BOOL set); --ssize_t transfer_file_internal(int infd, int outfd, size_t n, ssize_t (*read_fn)(int, void *, size_t), -- ssize_t (*write_fn)(int, const void *, size_t)); --SMB_OFF_T transfer_file(int infd,int outfd,SMB_OFF_T n); --void msleep(unsigned int t); --void become_daemon(void); --BOOL yesno(char *p); --void *Realloc(void *p,size_t size); --void safe_free(void *p); --BOOL get_myname(char *my_name); --int interpret_protocol(char *str,int def); --BOOL is_ipaddress(const char *str); --uint32 interpret_addr(const char *str); --struct in_addr *interpret_addr2(const char *str); --BOOL is_zero_ip(struct in_addr ip); --void zero_ip(struct in_addr *ip); --char *automount_lookup(char *user_name); --char *automount_lookup(char *user_name); --BOOL same_net(struct in_addr ip1,struct in_addr ip2,struct in_addr mask); --BOOL process_exists(pid_t pid); --char *uidtoname(uid_t uid); --char *gidtoname(gid_t gid); --uid_t nametouid(char *name); --gid_t nametogid(char *name); --void smb_panic(char *why); --char *readdirname(DIR *p); --BOOL is_in_path(char *name, name_compare_entry *namelist); --void set_namearray(name_compare_entry **ppname_array, char *namelist); --void free_namearray(name_compare_entry *name_array); --BOOL fcntl_lock(int fd, int op, SMB_OFF_T offset, SMB_OFF_T count, int type); --BOOL is_myname(char *s); --const char* get_my_primary_ip (void); --BOOL is_myname_or_ipaddr(char *s); --void set_remote_arch(enum remote_arch_types type); --enum remote_arch_types get_remote_arch(void); --void out_ascii(FILE *f, unsigned char *buf,int len); --void out_data(FILE *f,char *buf1,int len, int per_line); --void print_asc(int level, unsigned char *buf,int len); --void dump_data(int level,char *buf1,int len); --char *tab_depth(int depth); --int str_checksum(const char *s); --void zero_free(void *p, size_t size); --int set_maxfiles(int requested_max); --BOOL reg_split_key(char *full_keyname, uint32 *reg_type, char *key_name); --int smb_mkstemp(char *template); --void *smb_xmalloc(size_t size); --void *smb_xmemdup(const void *p, size_t size); --char *smb_xstrdup(const char *s); --int smb_xvasprintf(char **ptr, const char *format, va_list ap); --void *memdup(void *p, size_t size); --char *myhostname(void); --char *lock_path(char *name); --char *pid_path(char *name); --char *parent_dirname(const char *path); --BOOL ms_has_wild(char *s); --BOOL mask_match(char *string, char *pattern, BOOL is_case_sensitive); --BOOL unix_wild_match(char *pattern, char *string); --DATA_BLOB data_blob(const void *p, size_t length); --DATA_BLOB data_blob_talloc(TALLOC_CTX *mem_ctx, const void *p, size_t length); --void data_blob_free(DATA_BLOB *d); --void data_blob_clear(DATA_BLOB *d); --int _Insure_trap_error(int a1, int a2, int a3, int a4, int a5, int a6); -+SEC_DESC *cli_query_secdesc(struct cli_state *cli, int fnum, -+ TALLOC_CTX *mem_ctx); -+BOOL cli_set_secdesc(struct cli_state *cli, int fnum, SEC_DESC *sd); -+ -+/* The following definitions come from libsmb/clistr.c */ -+ -+int clistr_push(struct cli_state *cli, void *dest, const char *src, int dest_len, int flags); -+int clistr_pull(struct cli_state *cli, char *dest, const void *src, int dest_len, int src_len, int flags); -+int clistr_align_out(struct cli_state *cli, const void *p, int flags); -+int clistr_align_in(struct cli_state *cli, const void *p, int flags); - --/* The following definitions come from lib/util_file.c */ -+/* The following definitions come from libsmb/clitrans.c */ - --BOOL do_file_lock(int fd, int waitsecs, int type); --BOOL file_lock(int fd, int type, int secs, int *plock_depth); --BOOL file_unlock(int fd, int *plock_depth); --void *startfilepwent(char *pfile, char *s_readbuf, int bufsize, -- int *file_lock_depth, BOOL update); --void endfilepwent(void *vp, int *file_lock_depth); --SMB_BIG_UINT getfilepwpos(void *vp); --BOOL setfilepwpos(void *vp, SMB_BIG_UINT tok); --int getfileline(void *vp, char *linebuf, int linebuf_size); --char *fgets_slash(char *s2,int maxlen,FILE *f); --char *file_pload(char *syscmd, size_t *size); --char *fd_load(int fd, size_t *size); --char *file_load(char *fname, size_t *size); --char **file_lines_load(char *fname, int *numlines, BOOL convert); --char **fd_lines_load(int fd, int *numlines, BOOL convert); --char **file_lines_pload(char *syscmd, int *numlines, BOOL convert); --void file_lines_free(char **lines); --void file_lines_slashcont(char **lines); -+BOOL cli_send_trans(struct cli_state *cli, int trans, -+ const char *pipe_name, -+ int fid, int flags, -+ uint16 *setup, int lsetup, int msetup, -+ char *param, int lparam, int mparam, -+ char *data, int ldata, int mdata); -+BOOL cli_receive_trans(struct cli_state *cli,int trans, -+ char **param, int *param_len, -+ char **data, int *data_len); -+BOOL cli_send_nt_trans(struct cli_state *cli, -+ int function, -+ int flags, -+ uint16 *setup, int lsetup, int msetup, -+ char *param, int lparam, int mparam, -+ char *data, int ldata, int mdata); -+BOOL cli_receive_nt_trans(struct cli_state *cli, -+ char **param, int *param_len, -+ char **data, int *data_len); - --/* The following definitions come from lib/util_getent.c */ -+/* The following definitions come from libsmb/credentials.c */ - --struct sys_grent * getgrent_list(void); --void grent_free (struct sys_grent *glist); --struct sys_pwent * getpwent_list(void); --void pwent_free (struct sys_pwent *plist); --struct sys_userlist *get_users_in_group(const char *gname); --void free_userlist(struct sys_userlist *list_head); -+char *credstr(const uchar *cred); -+void cred_session_key(const DOM_CHAL *clnt_chal, const DOM_CHAL *srv_chal, const uchar *pass, -+ uchar session_key[8]); -+void cred_create(uchar session_key[8], DOM_CHAL *stor_cred, UTIME timestamp, -+ DOM_CHAL *cred); -+int cred_assert(DOM_CHAL *cred, uchar session_key[8], DOM_CHAL *stored_cred, -+ UTIME timestamp); -+BOOL clnt_deal_with_creds(uchar sess_key[8], -+ DOM_CRED *sto_clnt_cred, DOM_CRED *rcv_srv_cred); -+BOOL deal_with_creds(uchar sess_key[8], -+ DOM_CRED *sto_clnt_cred, -+ DOM_CRED *rcv_clnt_cred, DOM_CRED *rtn_srv_cred); - --/* The following definitions come from lib/util_seaccess.c */ -+/* The following definitions come from libsmb/doserr.c */ - --void se_map_generic(uint32 *access_mask, struct generic_mapping *mapping); --void se_map_standard(uint32 *access_mask, struct standard_mapping *mapping); --BOOL se_access_check(SEC_DESC *sd, NT_USER_TOKEN *token, -- uint32 acc_desired, uint32 *acc_granted, -- NTSTATUS *status); --SEC_DESC_BUF *se_create_child_secdesc(TALLOC_CTX *ctx, SEC_DESC *parent_ctr, -- BOOL child_container); -+char *dos_errstr(WERROR werror); - --/* The following definitions come from lib/util_sec.c */ -+/* The following definitions come from libsmb/errormap.c */ - --void sec_init(void); --uid_t sec_initial_uid(void); --gid_t sec_initial_gid(void); --BOOL non_root_mode(void); --void gain_root_privilege(void); --void gain_root_group_privilege(void); --void set_effective_uid(uid_t uid); --void set_effective_gid(gid_t gid); --void save_re_uid(void); --void restore_re_uid(void); --int set_re_uid(void); --void become_user_permanently(uid_t uid, gid_t gid); --BOOL is_setuid_root(void) ; -+NTSTATUS dos_to_ntstatus(int eclass, int ecode); -+void ntstatus_to_dos(NTSTATUS ntstatus, uint8 *eclass, uint32 *ecode); -+NTSTATUS werror_to_ntstatus(WERROR error); -+WERROR ntstatus_to_werror(NTSTATUS error); - --/* The following definitions come from lib/util_sid.c */ -+/* The following definitions come from libsmb/namequery.c */ - --void generate_wellknown_sids(void); --BOOL map_domain_sid_to_name(DOM_SID *sid, char *nt_domain); --BOOL lookup_known_rid(DOM_SID *sid, uint32 rid, char *name, enum SID_NAME_USE *psid_name_use); --BOOL map_domain_name_to_sid(DOM_SID *sid, char *nt_domain); --void split_domain_name(const char *fullname, char *domain, char *name); --char *sid_to_string(fstring sidstr_out, DOM_SID *sid); --const char *sid_string_static(DOM_SID *sid); --BOOL string_to_sid(DOM_SID *sidout, const char *sidstr); --BOOL sid_append_rid(DOM_SID *sid, uint32 rid); --BOOL sid_split_rid(DOM_SID *sid, uint32 *rid); --BOOL sid_peek_rid(DOM_SID *sid, uint32 *rid); --void sid_copy(DOM_SID *dst, const DOM_SID *src); --DOM_SID *sid_dup(DOM_SID *src); --BOOL sid_linearize(char *outbuf, size_t len, DOM_SID *sid); --BOOL sid_parse(char *inbuf, size_t len, DOM_SID *sid); --int sid_compare_auth(const DOM_SID *sid1, const DOM_SID *sid2); --int sid_compare(const DOM_SID *sid1, const DOM_SID *sid2); --int sid_compare_domain(const DOM_SID *sid1, const DOM_SID *sid2); --BOOL sid_equal(const DOM_SID *sid1, const DOM_SID *sid2); --BOOL sid_check_is_domain(const DOM_SID *sid); --BOOL sid_check_is_builtin(const DOM_SID *sid); --BOOL sid_check_is_in_our_domain(const DOM_SID *sid); --BOOL sid_check_is_in_builtin(const DOM_SID *sid); --size_t sid_size(DOM_SID *sid); --BOOL non_mappable_sid(DOM_SID *sid); --char *sid_binstring(DOM_SID *sid); -+struct node_status *node_status_query(int fd,struct nmb_name *name, -+ struct in_addr to_ip, int *num_names); -+BOOL name_status_find(const char *q_name, int q_type, int type, struct in_addr to_ip, char *name); -+BOOL name_register(int fd, const char *name, int name_type, -+ struct in_addr name_ip, int opcode, -+ BOOL bcast, -+ struct in_addr to_ip, int *count); -+struct in_addr *name_query(int fd,const char *name,int name_type, -+ BOOL bcast,BOOL recurse, -+ struct in_addr to_ip, int *count); -+FILE *startlmhosts(char *fname); -+BOOL getlmhostsent( FILE *fp, pstring name, int *name_type, struct in_addr *ipaddr); -+void endlmhosts(FILE *fp); -+BOOL name_register_wins(const char *name, int name_type); -+BOOL name_resolve_bcast(const char *name, int name_type, -+ struct in_addr **return_ip_list, int *return_count); -+BOOL resolve_name(const char *name, struct in_addr *return_ip, int name_type); -+BOOL resolve_srv_name(const char* srv_name, fstring dest_host, -+ struct in_addr *ip); -+BOOL find_master_ip(char *group, struct in_addr *master_ip); -+BOOL lookup_dc_name(const char *srcname, const char *domain, -+ struct in_addr *dc_ip, char *ret_name); -+BOOL get_dc_list(BOOL pdc_only, const char *group, struct in_addr **ip_list, int *count); -+BOOL get_lmb_list(struct in_addr **ip_list, int *count); - --/* The following definitions come from lib/util_sock.c */ -+/* The following definitions come from libsmb/nmblib.c */ - --BOOL is_a_socket(int fd); --void set_socket_options(int fd, char *options); --ssize_t read_udp_socket(int fd,char *buf,size_t len); --ssize_t read_with_timeout(int fd,char *buf,size_t mincnt,size_t maxcnt,unsigned int time_out); --BOOL send_keepalive(int client); --ssize_t read_data(int fd,char *buffer,size_t N); --ssize_t write_data(int fd,char *buffer,size_t N); --ssize_t write_socket_data(int fd,char *buffer,size_t N); --ssize_t write_socket(int fd,char *buf,size_t len); --ssize_t read_smb_length(int fd,char *inbuf,unsigned int timeout); --BOOL receive_smb(int fd,char *buffer, unsigned int timeout); --BOOL client_receive_smb(int fd,char *buffer, unsigned int timeout); --BOOL send_smb(int fd,char *buffer); --BOOL send_one_packet(char *buf,int len,struct in_addr ip,int port,int type); --int open_socket_in( int type, int port, int dlevel, uint32 socket_addr, BOOL rebind ); --int open_socket_out(int type, struct in_addr *addr, int port ,int timeout); --void client_setfd(int fd); --char *client_name(void); --char *client_addr(void); --char *get_socket_name(int fd); --char *get_socket_addr(int fd); --int create_pipe_sock(const char *socket_dir, -- const char *socket_name, -- mode_t dir_perms); --int sock_exec(const char *prog); -+void debug_nmb_packet(struct packet_struct *p); -+char *nmb_namestr(struct nmb_name *n); -+struct packet_struct *copy_packet(struct packet_struct *packet); -+void free_packet(struct packet_struct *packet); -+struct packet_struct *parse_packet(char *buf,int length, -+ enum packet_type packet_type); -+struct packet_struct *read_packet(int fd,enum packet_type packet_type); -+void make_nmb_name( struct nmb_name *n, const char *name, int type); -+BOOL nmb_name_equal(struct nmb_name *n1, struct nmb_name *n2); -+int build_packet(char *buf, struct packet_struct *p); -+BOOL send_packet(struct packet_struct *p); -+struct packet_struct *receive_packet(int fd,enum packet_type type,int t); -+struct packet_struct *receive_nmb_packet(int fd, int t, int trn_id); -+struct packet_struct *receive_dgram_packet(int fd, int t, char *mailslot_name); -+BOOL match_mailslot_name(struct packet_struct *p, char *mailslot_name); -+void sort_query_replies(char *data, int n, struct in_addr ip); -+char *dns_to_netbios_name(char *dns_name); -+int name_mangle( char *In, char *Out, char name_type ); -+int name_extract(char *buf,int ofs,char *name); -+int name_len(char *s1); - --/* The following definitions come from lib/util_str.c */ -+/* The following definitions come from libsmb/nterr.c */ - --void set_first_token(char *ptr); --BOOL next_token(char **ptr,char *buff,char *sep, size_t bufsize); --char **toktocliplist(int *ctok, char *sep); --int StrCaseCmp(const char *s, const char *t); --int StrnCaseCmp(const char *s, const char *t, size_t n); --BOOL strequal(const char *s1, const char *s2); --BOOL strnequal(const char *s1,const char *s2,size_t n); --BOOL strcsequal(const char *s1,const char *s2); --int strwicmp(char *psz1, char *psz2); --void strlower(char *s); --void strupper(char *s); --void strnorm(char *s); --BOOL strisnormal(char *s); --void string_replace(char *s,char oldc,char newc); --char *skip_string(char *buf,size_t n); --size_t str_charnum(const char *s); --BOOL trim_string(char *s,const char *front,const char *back); --BOOL strhasupper(const char *s); --BOOL strhaslower(const char *s); --size_t count_chars(const char *s,char c); --BOOL str_is_all(const char *s,char c); --char *safe_strcpy(char *dest,const char *src, size_t maxlength); --char *safe_strcat(char *dest, const char *src, size_t maxlength); --char *alpha_strcpy(char *dest, const char *src, const char *other_safe_chars, size_t maxlength); --char *StrnCpy(char *dest,const char *src,size_t n); --char *strncpyn(char *dest, const char *src,size_t n, char c); --size_t strhex_to_str(char *p, size_t len, const char *strhex); --BOOL in_list(char *s,char *list,BOOL casesensitive); --void string_free(char **s); --BOOL string_set(char **dest,const char *src); --void string_sub(char *s,const char *pattern,const char *insert, size_t len); --void fstring_sub(char *s,const char *pattern,const char *insert); --void pstring_sub(char *s,const char *pattern,const char *insert); --void all_string_sub(char *s,const char *pattern,const char *insert, size_t len); --void split_at_last_component(char *path, char *front, char sep, char *back); --char *octal_string(int i); --char *string_truncate(char *s, int length); --char *binary_string(char *buf, int len); -+char *get_nt_error_msg(NTSTATUS nt_code); -+char *nt_errstr(NTSTATUS nt_code); -+char *get_nt_error_c_code(NTSTATUS nt_code); -+ -+/* The following definitions come from libsmb/passchange.c */ -+ -+BOOL remote_password_change(const char *remote_machine, const char *user_name, -+ const char *old_passwd, const char *new_passwd, -+ char *err_str, size_t err_str_len); -+ -+/* The following definitions come from libsmb/pwd_cache.c */ -+ -+void pwd_init(struct pwd_info *pwd); -+BOOL pwd_is_nullpwd(const struct pwd_info *pwd); -+BOOL pwd_compare(struct pwd_info *pwd1, struct pwd_info *pwd2); -+void pwd_read(struct pwd_info *pwd, char *passwd_report, BOOL do_encrypt); -+void pwd_set_nullpwd(struct pwd_info *pwd); -+void pwd_set_cleartext(struct pwd_info *pwd, char *clr); -+void pwd_get_cleartext(struct pwd_info *pwd, char *clr); -+void pwd_set_lm_nt_16(struct pwd_info *pwd, uchar lm_pwd[16], uchar nt_pwd[16]); -+void pwd_get_lm_nt_16(struct pwd_info *pwd, uchar lm_pwd[16], uchar nt_pwd[16]); -+void pwd_make_lm_nt_16(struct pwd_info *pwd, char *clr); -+void pwd_make_lm_nt_owf(struct pwd_info *pwd, uchar cryptkey[8]); -+void pwd_get_lm_nt_owf(struct pwd_info *pwd, uchar lm_owf[24], uchar nt_owf[24]); -+ -+/* The following definitions come from libsmb/smbdes.c */ -+ -+void E_P16(const unsigned char *p14,unsigned char *p16); -+void E_P24(const unsigned char *p21, const unsigned char *c8, unsigned char *p24); -+void D_P16(const unsigned char *p14, const unsigned char *in, unsigned char *out); -+void E_old_pw_hash( unsigned char *p14, const unsigned char *in, unsigned char *out); -+void cred_hash1(unsigned char *out, const unsigned char *in, const unsigned char *key); -+void cred_hash2(unsigned char *out, const unsigned char *in, const unsigned char *key); -+void cred_hash3(unsigned char *out, unsigned char *in, const unsigned char *key, int forw); -+void SamOEMhash( unsigned char *data, const unsigned char *key, int val); -+void sam_pwd_hash(unsigned int rid, const uchar *in, uchar *out, int forw); - --/* The following definitions come from lib/util_unistr.c */ -+/* The following definitions come from libsmb/smbencrypt.c */ - --size_t unix_PutUniCode(char *dst,const char *src, ssize_t len, BOOL null_terminate); --size_t dos_PutUniCode(char *dst,const char *src, ssize_t len, BOOL null_terminate); --void unistr_to_dos(char *dest, const char *src, size_t len); --char *skip_unibuf(char *src, size_t len); --char *dos_unistrn2(uint16 *src, int len); --char *dos_unistr2(uint16 *src); --char *dos_unistr2_to_str(UNISTR2 *str); --void ascii_to_unistr(uint16 *dest, const char *src, int maxlen); --void unistr_to_ascii(char *dest, const uint16 *src, int len); --void unistr2_to_ascii(char *dest, const UNISTR2 *str, size_t maxlen); --char *unistr2_tdup(TALLOC_CTX *ctx, const UNISTR2 *str); --uint32 buffer2_to_uint32(BUFFER2 *str); --char *dos_buffer2_to_str(BUFFER2 *str); --char *dos_buffer2_to_multistr(BUFFER2 *str); --size_t dos_struni2(char *dst, const char *src, size_t max_len); --char *dos_unistr(char *buf); --int unistrlen(uint16 *s); --int unistrcpy(uint16 *dst, uint16 *src); --void default_unicode_map(smb_ucs2_t **pp_cp_to_ucs2, uint16 **pp_ucs2_to_cp); --BOOL load_unicode_map(const char *codepage, smb_ucs2_t **pp_cp_to_ucs2, uint16 **pp_ucs2_to_cp); --BOOL load_dos_unicode_map(int codepage); --BOOL load_unix_unicode_map(const char *unix_char_set, BOOL override); --smb_ucs2_t *multibyte_to_unicode(smb_ucs2_t *dst, const char *src, -- size_t dst_len, smb_ucs2_t *cp_to_ucs2); --char *unicode_to_unix(char *dst, const smb_ucs2_t *src, size_t dst_len); --smb_ucs2_t *unix_to_unicode(smb_ucs2_t *dst, const char *src, size_t dst_len); --size_t unicode_to_unix_char(char *dst, const smb_ucs2_t src); --char *unicode_to_dos(char *dst, const smb_ucs2_t *src, size_t dst_len); --size_t unicode_to_dos_char(char *dst, const smb_ucs2_t src); --smb_ucs2_t *dos_to_unicode(smb_ucs2_t *dst, const char *src, size_t dst_len); --size_t strlen_w(const smb_ucs2_t *src); --smb_ucs2_t *safe_strcpy_w(smb_ucs2_t *dest,const smb_ucs2_t *src, size_t maxlength); --smb_ucs2_t *safe_strcat_w(smb_ucs2_t *dest, const smb_ucs2_t *src, size_t maxlength); --int strcmp_w(const smb_ucs2_t *s1, const smb_ucs2_t *s2); --int strncmp_w(const smb_ucs2_t *s1, const smb_ucs2_t *s2, size_t len); --smb_ucs2_t *strstr_w(const smb_ucs2_t *s1, const smb_ucs2_t *s2); --smb_ucs2_t *strchr_w(const smb_ucs2_t *s, smb_ucs2_t c); --smb_ucs2_t *strrchr_w(const smb_ucs2_t *s, smb_ucs2_t c); --smb_ucs2_t *strtok_w(smb_ucs2_t *s1, const smb_ucs2_t *s2); --smb_ucs2_t *strdup_w(const smb_ucs2_t *s); --int isupper_w( smb_ucs2_t val); --int islower_w( smb_ucs2_t val); --int isdigit_w( smb_ucs2_t val); --int isxdigit_w( smb_ucs2_t val); --int isspace_w( smb_ucs2_t val); --smb_ucs2_t toupper_w( smb_ucs2_t val ); --smb_ucs2_t tolower_w( smb_ucs2_t val ); --void set_first_token_w(smb_ucs2_t *ptr); --BOOL next_token_w(smb_ucs2_t **ptr, smb_ucs2_t *buff, smb_ucs2_t *sep, size_t bufsize); --smb_ucs2_t **toktocliplist_w(int *ctok, smb_ucs2_t *sep); --int StrCaseCmp_w(const smb_ucs2_t *s, const smb_ucs2_t *t); --int StrnCaseCmp_w(const smb_ucs2_t *s, const smb_ucs2_t *t, size_t n); --BOOL strequal_w(const smb_ucs2_t *s1, const smb_ucs2_t *s2); --BOOL strnequal_w(const smb_ucs2_t *s1,const smb_ucs2_t *s2,size_t n); --BOOL strcsequal_w(const smb_ucs2_t *s1,const smb_ucs2_t *s2); --void strlower_w(smb_ucs2_t *s); --void strupper_w(smb_ucs2_t *s); --void strnorm_w(smb_ucs2_t *s); --BOOL strisnormal_w(smb_ucs2_t *s); --void string_replace_w(smb_ucs2_t *s, smb_ucs2_t oldc, smb_ucs2_t newc); --smb_ucs2_t *skip_string_w(smb_ucs2_t *buf,size_t n); --size_t str_charnum_w(const smb_ucs2_t *s); --BOOL trim_string_w(smb_ucs2_t *s,const smb_ucs2_t *front,const smb_ucs2_t *back); --BOOL strhasupper_w(const smb_ucs2_t *s); --BOOL strhaslower_w(const smb_ucs2_t *s); --size_t count_chars_w(const smb_ucs2_t *s,smb_ucs2_t c); --BOOL str_is_all_w(const smb_ucs2_t *s,smb_ucs2_t c); --smb_ucs2_t *alpha_strcpy_w(smb_ucs2_t *dest, const smb_ucs2_t *src, const smb_ucs2_t *other_safe_chars, size_t maxlength); --smb_ucs2_t *StrnCpy_w(smb_ucs2_t *dest,const smb_ucs2_t *src,size_t n); --smb_ucs2_t *strncpyn_w(smb_ucs2_t *dest, const smb_ucs2_t *src,size_t n, smb_ucs2_t c); --size_t strhex_to_str_w(char *p, size_t len, const smb_ucs2_t *strhex); --BOOL in_list_w(smb_ucs2_t *s,smb_ucs2_t *list,BOOL casesensitive); --BOOL string_init_w(smb_ucs2_t **dest,const smb_ucs2_t *src); --void string_free_w(smb_ucs2_t **s); --BOOL string_set_w(smb_ucs2_t **dest,const smb_ucs2_t *src); --void string_sub_w(smb_ucs2_t *s,const smb_ucs2_t *pattern,const smb_ucs2_t *insert, size_t len); --void fstring_sub_w(smb_ucs2_t *s,const smb_ucs2_t *pattern,const smb_ucs2_t *insert); --void pstring_sub_w(smb_ucs2_t *s,const smb_ucs2_t *pattern,smb_ucs2_t *insert); --void all_string_sub_w(smb_ucs2_t *s,const smb_ucs2_t *pattern,const smb_ucs2_t *insert, size_t len); --void split_at_last_component_w(smb_ucs2_t *path, smb_ucs2_t *front, smb_ucs2_t sep, smb_ucs2_t *back); --smb_ucs2_t *octal_string_w(int i); --smb_ucs2_t *string_truncate_w(smb_ucs2_t *s, size_t length); --smb_ucs2_t doscp2ucs2(int w); --int ucs2doscp(smb_ucs2_t w); --int rpcstr_pull(char* dest, void *src, int dest_len, int src_len, int flags); -+void SMBencrypt(const uchar *passwd, uchar *c8, uchar *p24); -+void E_md4hash(const uchar *passwd, uchar *p16); -+void nt_lm_owf_gen(char *pwd, uchar nt_p16[16], uchar p16[16]); -+void SMBOWFencrypt(uchar passwd[16], uchar *c8, uchar p24[24]); -+void NTLMSSPOWFencrypt(uchar passwd[8], uchar *ntlmchalresp, uchar p24[24]); -+void SMBNTencrypt(const uchar *passwd, uchar *c8, uchar *p24); -+BOOL make_oem_passwd_hash(char data[516], const char *passwd, uchar old_pw_hash[16], BOOL unicode); -+BOOL encode_pw_buffer(char buffer[516], const char *new_pass, -+ int new_pw_len, BOOL nt_pass_set); -+BOOL decode_pw_buffer(char in_buffer[516], char *new_pwrd, -+ int new_pwrd_size, uint32 *new_pw_len, -+ uchar nt_p16[16], uchar p16[16]); -+void nt_owf_genW(const UNISTR2 *pwd, uchar nt_p16[16]); - --/* The following definitions come from lib/wins_srv.c */ -+/* The following definitions come from libsmb/smberr.c */ - --BOOL wins_srv_load_list( char *src ); --struct in_addr wins_srv_ip( void ); --void wins_srv_died( struct in_addr boothill_ip ); --unsigned long wins_srv_count( void ); -+char *smb_dos_err_name(uint8 class, uint16 num); -+char *get_dos_error_msg(WERROR result); -+char *smb_dos_err_class(uint8 class); -+char *smb_dos_errstr(char *inbuf); -+WERROR map_werror_from_unix(int error); -+ -+/* The following definitions come from libsmb/unexpected.c */ -+ -+void unexpected_packet(struct packet_struct *p); -+void clear_unexpected(time_t t); -+struct packet_struct *receive_unexpected(enum packet_type packet_type, int id, -+ char *mailslot_name); - - /* The following definitions come from locking/brlock.c */ - -@@ -1519,6 +1521,9 @@ - struct name_record **n); - void kill_async_dns_child(void); - -+/* The following definitions come from nmbd/nmbd.c */ -+ -+ - /* The following definitions come from nmbd/nmbd_become_dmb.c */ - - void add_domain_names(time_t t); -@@ -1549,9 +1554,6 @@ - void collect_all_workgroup_names_from_wins_server(time_t t); - void sync_all_dmbs(time_t t); - --/* The following definitions come from nmbd/nmbd.c */ -- -- - /* The following definitions come from nmbd/nmbd_elections.c */ - - void check_master_browser_exists(time_t t); -@@ -2435,14 +2437,19 @@ - /* The following definitions come from printing/print_cups.c */ - - -+/* The following definitions come from printing/print_generic.c */ -+ -+ -+/* The following definitions come from printing/print_svid.c */ -+ -+void sysv_printer_fn(void (*fn)(char *, char *)); -+int sysv_printername_ok(char *name); -+ - /* The following definitions come from printing/printfsp.c */ - - files_struct *print_fsp_open(connection_struct *conn, char *fname); - void print_fsp_end(files_struct *fsp, BOOL normal_close); - --/* The following definitions come from printing/print_generic.c */ -- -- - /* The following definitions come from printing/printing.c */ - - BOOL print_backend_init(void); -@@ -2468,11 +2475,6 @@ - BOOL print_queue_resume(struct current_user *user, int snum, WERROR *errcode); - BOOL print_queue_purge(struct current_user *user, int snum, WERROR *errcode); - --/* The following definitions come from printing/print_svid.c */ -- --void sysv_printer_fn(void (*fn)(char *, char *)); --int sysv_printername_ok(char *name); -- - /* The following definitions come from profile/profile.c */ - - void profile_message(int msg_type, pid_t src, void *buf, size_t len); -@@ -2531,42 +2533,6 @@ - - BOOL change_trust_account_password( char *domain, char *remote_machine_list); - --/* The following definitions come from rpcclient/cmd_dfs.c */ -- -- --/* The following definitions come from rpcclient/cmd_lsarpc.c */ -- -- --/* The following definitions come from rpcclient/cmd_netlogon.c */ -- -- --/* The following definitions come from rpcclient/cmd_reg.c */ -- -- --/* The following definitions come from rpcclient/cmd_samr.c */ -- -- --/* The following definitions come from rpcclient/cmd_spoolss.c */ -- --BOOL get_short_archi(char *short_archi, char *long_archi); --void set_drv_info_3_env (DRIVER_INFO_3 *info, const char *arch); -- --/* The following definitions come from rpcclient/cmd_srvsvc.c */ -- -- --/* The following definitions come from rpcclient/display_sec.c */ -- --char *get_sec_mask_str(uint32 type); --void display_sec_access(SEC_ACCESS *info); --void display_sec_ace(SEC_ACE *ace); --void display_sec_acl(SEC_ACL *sec_acl); --void display_sec_desc(SEC_DESC *sec); -- --/* The following definitions come from rpcclient/rpcclient.c */ -- --void fetch_machine_sid(struct cli_state *cli); --int main(int argc, char *argv[]); -- - /* The following definitions come from rpc_parse/parse_dfs.c */ - - void init_dfs_q_dfs_exist(DFS_Q_DFS_EXIST *q_d); -@@ -4273,6 +4239,42 @@ - - NTSTATUS _wks_query_info(pipes_struct *p, WKS_Q_QUERY_INFO *q_u, WKS_R_QUERY_INFO *r_u); - -+/* The following definitions come from rpcclient/cmd_dfs.c */ -+ -+ -+/* The following definitions come from rpcclient/cmd_lsarpc.c */ -+ -+ -+/* The following definitions come from rpcclient/cmd_netlogon.c */ -+ -+ -+/* The following definitions come from rpcclient/cmd_reg.c */ -+ -+ -+/* The following definitions come from rpcclient/cmd_samr.c */ -+ -+ -+/* The following definitions come from rpcclient/cmd_spoolss.c */ -+ -+BOOL get_short_archi(char *short_archi, char *long_archi); -+void set_drv_info_3_env (DRIVER_INFO_3 *info, const char *arch); -+ -+/* The following definitions come from rpcclient/cmd_srvsvc.c */ -+ -+ -+/* The following definitions come from rpcclient/display_sec.c */ -+ -+char *get_sec_mask_str(uint32 type); -+void display_sec_access(SEC_ACCESS *info); -+void display_sec_ace(SEC_ACE *ace); -+void display_sec_acl(SEC_ACL *sec_acl); -+void display_sec_desc(SEC_DESC *sec); -+ -+/* The following definitions come from rpcclient/rpcclient.c */ -+ -+void fetch_machine_sid(struct cli_state *cli); -+int main(int argc, char *argv[]); -+ - /* The following definitions come from smbd/blocking.c */ - - BOOL push_blocking_lock_request( char *inbuf, int length, int lock_timeout, int lock_num); -@@ -4740,24 +4742,6 @@ - void sys_utmp_claim(const char *username, const char *hostname, - const char *id_str, int id_num); - --/* The following definitions come from smbd/vfs.c */ -- --BOOL smbd_vfs_init(connection_struct *conn); --BOOL vfs_directory_exist(connection_struct *conn, const char *dname, SMB_STRUCT_STAT *st); --int vfs_mkdir(connection_struct *conn, char *const fname, mode_t mode); --char *vfs_getwd(connection_struct *conn, char *unix_path); --BOOL vfs_object_exist(connection_struct *conn, const char *fname,SMB_STRUCT_STAT *sbuf); --BOOL vfs_file_exist(connection_struct *conn, const char *fname,SMB_STRUCT_STAT *sbuf); --ssize_t vfs_read_data(files_struct *fsp, char *buf, size_t byte_count); --ssize_t vfs_write_data(files_struct *fsp,const char *buffer,size_t N); --int vfs_allocate_file_space(files_struct *fsp, SMB_OFF_T len); --int vfs_set_filelen(files_struct *fsp, SMB_OFF_T len); --SMB_OFF_T vfs_transfer_file(files_struct *in, files_struct *out, SMB_OFF_T n); --char *vfs_readdirname(connection_struct *conn, void *p); --int vfs_ChDir(connection_struct *conn, const char *path); --char *vfs_GetWd(connection_struct *conn, char *path); --BOOL reduce_name(connection_struct *conn, char *s,char *dir,BOOL widelinks); -- - /* The following definitions come from smbd/vfs-wrap.c */ +diff -ur samba-2.2.4+5pre1.orig/source/passdb/secrets.c samba-2.2.4+5pre1/source/passdb/secrets.c +--- samba-2.2.4+5pre1.orig/source/passdb/secrets.c Mon Mar 18 17:55:49 2002 ++++ samba-2.2.4+5pre1/source/passdb/secrets.c Thu Jun 13 10:37:44 2002 +@@ -34,8 +34,7 @@ + if (tdb) + return True; - int vfswrap_dummy_connect(connection_struct *conn, const char *service, const char *user); -@@ -4822,6 +4806,24 @@ - int vfswrap_sys_acl_free_text(struct connection_struct *conn, char *text); - int vfswrap_sys_acl_free_acl(struct connection_struct *conn, SMB_ACL_T posix_acl); - int vfswrap_sys_acl_free_qualifier(struct connection_struct *conn, void *qualifier, SMB_ACL_TAG_T tagtype); -+ -+/* The following definitions come from smbd/vfs.c */ -+ -+BOOL smbd_vfs_init(connection_struct *conn); -+BOOL vfs_directory_exist(connection_struct *conn, const char *dname, SMB_STRUCT_STAT *st); -+int vfs_mkdir(connection_struct *conn, char *const fname, mode_t mode); -+char *vfs_getwd(connection_struct *conn, char *unix_path); -+BOOL vfs_object_exist(connection_struct *conn, const char *fname,SMB_STRUCT_STAT *sbuf); -+BOOL vfs_file_exist(connection_struct *conn, const char *fname,SMB_STRUCT_STAT *sbuf); -+ssize_t vfs_read_data(files_struct *fsp, char *buf, size_t byte_count); -+ssize_t vfs_write_data(files_struct *fsp,const char *buffer,size_t N); -+int vfs_allocate_file_space(files_struct *fsp, SMB_OFF_T len); -+int vfs_set_filelen(files_struct *fsp, SMB_OFF_T len); -+SMB_OFF_T vfs_transfer_file(files_struct *in, files_struct *out, SMB_OFF_T n); -+char *vfs_readdirname(connection_struct *conn, void *p); -+int vfs_ChDir(connection_struct *conn, const char *path); -+char *vfs_GetWd(connection_struct *conn, char *path); -+BOOL reduce_name(connection_struct *conn, char *s,char *dir,BOOL widelinks); +- get_private_directory(fname); +- pstrcat(fname,"/secrets.tdb"); ++ pstrcpy(fname,state_path("secrets.tdb")); - /* The following definitions come from smbwrapper/realcalls.c */ + tdb = tdb_open_log(fname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); |