Moved the extra struct definitions Luke added to smb.h into rpcclient.h

and client.h. They are still included from smb.h so nothing should
change (or break) but this keeps the new definitions easier to
maintain. This is similar to what I did with ntdomain.h
Jeremy.

2 files changed, 197 insertions, 0 deletions

diff --git a/source/include/client.h b/source/include/client.h
new file mode 100644
index 00000000000..6d0be057ae3
--- /dev/null
+++ b/source/include/client.h
@@ -0,0 +1,79 @@
+/*
+   Unix SMB/Netbios implementation.
+   Version 1.9.
+   SMB parameters and setup
+   Copyright (C) Andrew Tridgell 1992-1998
+   Copyright (C) Luke Kenneth Casson Leighton 1996-1998
+   Copyright (C) Jeremy Allison 1998
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef _CLIENT_H
+#define _CLIENT_H
+
+/*
+ * These definitions depend on smb.h
+ */
+
+struct cli_state {
+  int fd;
+  int cnum;
+  int pid;
+  int mid;
+  int uid;
+  int protocol;
+  int sec_mode;
+  int rap_error;
+  int privilages;
+
+  fstring eff_name;
+  fstring desthost;
+  fstring user_name;
+  fstring domain;
+
+  fstring share;
+  fstring dev;
+  struct nmb_name called;
+  struct nmb_name calling;
+  fstring full_dest_host_name;
+  struct in_addr dest_ip;
+
+  struct pwd_info pwd;
+  char cryptkey[8];
+  uint32 sesskey;
+  int serverzone;
+  uint32 servertime;
+  int readbraw_supported;
+  int writebraw_supported;
+  int timeout;
+  int max_xmit;
+  char *outbuf;
+  char *inbuf;
+  int bufsize;
+  int initialised;
+  /*
+   * Only used in NT domain calls.
+   */
+  uint32 nt_error;                   /* NT RPC error code. */
+  uint16 nt_pipe_fnum;               /* Pipe handle. */
+  unsigned char sess_key[16];        /* Current session key. */
+  DOM_CRED clnt_cred;                /* Client credential. */
+  fstring mach_acct;                 /* MYNAME$. */
+  fstring srv_name_slash;            /* \\remote server. */
+  fstring clnt_name_slash;            /* \\local client. */
+};
+
+#endif /* _CLIENT_H */
diff --git a/source/include/rpcclient.h b/source/include/rpcclient.h
new file mode 100644
index 00000000000..2fa91152cc0
--- /dev/null
+++ b/source/include/rpcclient.h
@@ -0,0 +1,118 @@
+/*
+   Unix SMB/Netbios implementation.
+   Version 1.9.
+   SMB parameters and setup
+   Copyright (C) Andrew Tridgell 1992-1998
+   Copyright (C) Luke Kenneth Casson Leighton 1996-1998
+   Copyright (C) Jeremy Allison 1998
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef _RPCCLIENT_H
+#define _RPCCLIENT_H
+
+struct tar_client_info
+{
+    int blocksize;
+    BOOL inc;
+    BOOL reset;
+    BOOL excl;
+    char type;
+    int attrib;
+    char **cliplist;
+    int clipn;
+    int tp;
+    int num_files;
+    int buf_size;
+    int bytes_written;
+    char *buf;
+    int handle;
+    int print_mode;
+    char *file_mode;
+};
+
+struct nt_client_info
+{
+    /************* \PIPE\NETLOGON stuff ******************/
+
+    fstring mach_acct;
+
+    uint8 sess_key[16];
+    DOM_CRED clnt_cred;
+    DOM_CRED rtn_cred;
+
+    NET_ID_INFO_CTR ctr;
+    NET_USER_INFO_3 user_info3;
+
+    /************** \PIPE\lsarpc stuff ********************/
+
+    POLICY_HND lsa_info_pol;
+
+    /* domain member */
+    fstring level3_dom;
+    fstring level3_sid;
+
+    /* domain controller */
+    fstring level5_dom;
+    fstring level5_sid;
+
+    /************** \PIPE\samr stuff  ********************/
+
+    POLICY_HND samr_pol_connect;
+    POLICY_HND samr_pol_open_domain;
+    POLICY_HND samr_pol_open_user;
+
+    struct acct_info *sam;
+    int num_sam_entries;
+};
+
+struct client_info
+{
+    struct in_addr dest_ip;
+    fstring dest_host;
+    fstring query_host;
+    uint8 name_type;
+
+    fstring myhostname;
+    fstring mach_acct;
+
+    pstring cur_dir;
+    pstring base_dir;
+    pstring file_sel;
+
+    fstring service;
+    fstring share;
+    fstring svc_type;
+
+    time_t newer_than;
+    int archive_level;
+    int dir_total;
+    int put_total_time_ms;
+    int put_total_size;
+    int get_total_time_ms;
+    int get_total_size;
+    int print_mode;
+    BOOL translation;
+    BOOL recurse_dir;
+    BOOL prompt;
+    BOOL lowercase;
+    BOOL abort_mget;
+
+    struct tar_client_info tar;
+    struct nt_client_info dom;
+};
+
+#endif /* _RPCCLIENT_H */