dunno what these are, it's late and i'm tired. i think they're bug-fixes.

i also added rpc_client_proto.h and libsmb_proto.h but they're not yet
used.

diff --git a/source/Makefile.in b/source/Makefile.in
index 005a3a32610c78c1f87d42a3363b1efab93526e0..e8f98447f1371280f73185ae26535098e5c31509 100644 (file)
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -837,17 +837,28 @@ uninstallcp:
 clean: 
        -rm -f core */*~ *~ */*.o */*.po */*.po32 */*.lo */*.so
 
-proto: rpc_parse_proto all_other_proto_for_now
+proto: libsmb_proto rpc_client_proto rpc_parse_proto \
+               all_other_proto_for_now
 
 all_other_proto_for_now: 
        @echo rebuilding include/proto.h
        @cd $(srcdir) && $(AWK) -f script/mkproto.awk `echo $(PROTO_OBJ) | tr ' ' '\n' | sed -e 's/\.o/\.c/g' | sort -u | egrep -v 'ubiqx/|wrapped'` > include/proto.h
 
+libsmb_proto:
+       @echo rebuilding include/libsmb_proto.h
+       @cd $(srcdir) && $(AWK) -v headername=_LIB_SMB_PROTO_H_ \
+         -f script/mkproto.awk `echo $(LIBSMB_OBJ) | tr ' ' '\n' | sed -e 's/\.o/\.c/g' | sort -u | egrep -v 'ubiqx/|wrapped'` > include/lib_smb_proto.h
+
 rpc_parse_proto:
        @echo rebuilding include/rpc_parse_proto.h
        @cd $(srcdir) && $(AWK) -v headername=_RPC_PARSE_PROTO_H_ \
          -f script/mkproto.awk `echo $(RPC_PARSE_OBJ) | tr ' ' '\n' | sed -e 's/\.o/\.c/g' | sort -u | egrep -v 'ubiqx/|wrapped'` > include/rpc_parse_proto.h
 
+rpc_client_proto:
+       @echo rebuilding include/rpc_client_proto.h
+       @cd $(srcdir) && $(AWK) -v headername=_RPC_CLIENT_PROTO_H_ \
+         -f script/mkproto.awk `echo $(RPC_CLIENT_OBJ) | tr ' ' '\n' | sed -e 's/\.o/\.c/g' | sort -u | egrep -v 'ubiqx/|wrapped'` > include/rpc_client_proto.h
+
 etags:
        etags `find . -name "*.[ch]"`
 

diff --git a/source/rpc_client/cli_connect.c b/source/rpc_client/cli_connect.c
index 739a14d438a1a84c322d12ae2655a1933b0a9df5..6322302c95531b491d0df76f400b13862a247d72 100644 (file)
--- a/source/rpc_client/cli_connect.c
+++ b/source/rpc_client/cli_connect.c
@@ -451,7 +451,14 @@ BOOL cli_get_con_usr_sesskey(struct cli_connection *con, uchar usr_sess_key[16])
                return False;
        }
        nt = cli_conn_get_ntinfo(con);
-       memcpy(usr_sess_key, nt->usr_sess_key, sizeof(nt->usr_sess_key));
+       if (nt != NULL)
+       {
+               memcpy(usr_sess_key, nt->usr_sess_key, sizeof(nt->usr_sess_key));
+       }
+       else
+       {
+               memset(usr_sess_key, 0, sizeof(nt->usr_sess_key));
+       }
 
        return True;
 }

diff --git a/source/samrd/srv_samr_usr_tdb.c b/source/samrd/srv_samr_usr_tdb.c
index 998602483c3cfa99d6348fe290adbbd2e85d7b16..4a518e5a4907a238dc4743b9cb2615437e15117e 100644 (file)
--- a/source/samrd/srv_samr_usr_tdb.c
+++ b/source/samrd/srv_samr_usr_tdb.c
@@ -590,13 +590,13 @@ uint32 _samr_set_userinfo(const POLICY_HND *pol, uint16 switch_value,
                return NT_STATUS_INVALID_HANDLE;
        }
 
+       DEBUG(5,("samr_reply_set_userinfo: rid:0x%x\n", rid));
+
        if (!cli_get_usr_sesskey(pol, user_sess_key))
        {
                return NT_STATUS_INVALID_HANDLE;
        }
 
-       DEBUG(5,("samr_reply_set_userinfo: rid:0x%x\n", rid));
-
        if (ctr == NULL)
        {
                DEBUG(5,("samr_reply_set_userinfo: NULL info level\n"));