summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/proto.h6
-rw-r--r--source3/include/smb.h8
2 files changed, 5 insertions, 9 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 779f6bd87e..8c082a6140 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4,8 +4,7 @@
/*The following definitions come from access.c */
BOOL check_access(int snum);
-BOOL allow_access(char *deny_list,char *allow_list,struct from_host *client);
-BOOL fromhost(int sock,struct from_host *f);
+BOOL allow_access(char *deny_list,char *allow_list,char *cname,char *caddr);
/*The following definitions come from charcnv.c */
@@ -234,6 +233,7 @@ BOOL lp_widelinks(int );
BOOL lp_syncalways(int );
BOOL lp_map_system(int );
BOOL lp_delete_readonly(int );
+BOOL lp_fake_oplocks(int );
int lp_create_mode(int );
int lp_max_connections(int );
int lp_defaultcase(int );
@@ -913,6 +913,8 @@ int interpret_security(char *str,int def);
uint32 interpret_addr(char *str);
struct in_addr *interpret_addr2(char *str);
BOOL zero_ip(struct in_addr ip);
+char *client_name(void);
+char *client_addr(void);
void standard_sub_basic(char *s);
BOOL same_net(struct in_addr ip1,struct in_addr ip2,struct in_addr mask);
int PutUniCode(char *dst,char *src);
diff --git a/source3/include/smb.h b/source3/include/smb.h
index f5d35d5261..af6e24c4ab 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -293,6 +293,7 @@ typedef struct
int pos;
int size;
int mode;
+ int uid;
char *mmap_ptr;
int mmap_size;
write_bmpx_struct *wbmpx_ptr;
@@ -653,13 +654,6 @@ struct connect_record
#define ERRHRD 0x03 /* Error is an hardware error. */
#define ERRCMD 0xFF /* Command was not in the "SMB" format. */
-/* structure used to hold the incoming hosts info */
-struct from_host {
- char *name; /* host name */
- char *addr; /* host address */
- struct sockaddr_in *sin; /* their side of the link */
-};
-
#ifdef __STDC__
int Debug1(char *, ...);
#else