loadparm.c proto.h:

	added lp_domainsid()

lsaparse.c smb.h:

	debugging structures and parsing functions

pipes.c:

	finally got to the functions that will go into the RPC switch statement.
(This used to be commit d15aed8a9c58a7cc90befaee2d5a2752708f9327)

2 files changed, 6 insertions, 3 deletions

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 8f8ec5aa8a..fab69de3d1 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -152,6 +152,7 @@ char *lp_socket_address(void);
 char *lp_nis_home_map_name(void);
 char *lp_announce_version(void);
 char *lp_netbios_aliases(void);
+char *lp_domainsid(void);
 BOOL lp_dns_proxy(void);
 BOOL lp_wins_support(void);
 BOOL lp_wins_proxy(void);
@@ -928,7 +929,7 @@ BOOL in_group(gid_t group, int current_gid, int ngroups, int *groups);
 char *StrCpy(char *dest,char *src);
 char *StrnCpy(char *dest,char *src,int n);
 void putip(void *dest,void *src);
-int name_mangle(char *In,char *Out,char name_type);
+int name_mangle( char *In, char *Out, char name_type );
 BOOL file_exist(char *fname,struct stat *sbuf);
 time_t file_modtime(char *fname);
 BOOL directory_exist(char *dname,struct stat *st);
@@ -989,7 +990,7 @@ BOOL receive_message_or_smb(int smbfd, int oplock_fd,
 BOOL send_smb(int fd,char *buffer);
 char *name_ptr(char *buf,int ofs);
 int name_extract(char *buf,int ofs,char *name);
-int name_len(char *s);
+int name_len( char *s );
 BOOL send_one_packet(char *buf,int len,struct in_addr ip,int port,int type);
 void msleep(int t);
 BOOL in_list(char *s,char *list,BOOL casesensitive);
diff --git a/source3/include/smb.h b/source3/include/smb.h
index c347202743..9f5279fca0 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -326,6 +326,7 @@ typedef struct domsid2_info
 {
   uint32 type; /* value is 5 */
   uint32 undoc; /* value is 0 */
+
   UNIHDR2 hdr; /* XXXX conflict between hdr and str for length */
   UNISTR  str; /* XXXX conflict between hdr and str for length */
 
@@ -488,7 +489,8 @@ typedef struct lsa_r_open_pol_info
 /* LSA_Q_QUERY_INFO - LSA query info policy */
 typedef struct lsa_query_info
 {
-    uint16 info_class; /* info class (also a policy handle?) */
+	LSA_POL_HND pol; /* policy handle */
+    uint16 info_class; /* info class */
 
 } LSA_Q_QUERY_INFO;