summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2001-06-19 19:56:06 +0000
committerJeremy Allison <jra@samba.org>2001-06-19 19:56:06 +0000
commit92033860636abf665ddd968d991bd789aabeec9a (patch)
tree18880cea4a0efde584a4036bac7c7e0e1e881bba
parentd2846a3ea93984ab091b6a70bf127e9f7eab1c58 (diff)
downloadsamba-92033860636abf665ddd968d991bd789aabeec9a.tar.gz
samba-92033860636abf665ddd968d991bd789aabeec9a.tar.bz2
samba-92033860636abf665ddd968d991bd789aabeec9a.zip
INFO_24 sometimes has a 2 byte length, sometimes doesn't. Safer to not
depend on it... Jeremy. (This used to be commit 0fe11c329f7b379299be65795031e4f1b14e0bec)
-rw-r--r--source3/include/proto.h9
-rw-r--r--source3/include/rpc_samr.h1
-rw-r--r--source3/rpc_parse/parse_samr.c9
3 files changed, 7 insertions, 12 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index f1a20afe4d..93af6c85c2 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -408,6 +408,7 @@ 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);
/* The following definitions come from libsmb/clireadwrite.c */
@@ -3221,8 +3222,7 @@ void init_sam_user_info11(SAM_USER_INFO_11 * usr,
NTTIME * expiry,
char *mach_acct,
uint32 rid_user, uint32 rid_group, uint16 acct_ctrl);
-void init_sam_user_info24(SAM_USER_INFO_24 * usr,
- char newpass[516], uint16 passlen);
+void init_sam_user_info24(SAM_USER_INFO_24 * usr, char newpass[516]);
void init_sam_user_info23W(SAM_USER_INFO_23 * usr, NTTIME * logon_time, /* all zeros */
NTTIME * logoff_time, /* all zeros */
NTTIME * kickoff_time, /* all zeros */
@@ -4644,7 +4644,7 @@ int tdb_unpack(char *buf, int bufsize, char *fmt, ...);
TDB_CONTEXT *tdb_open_log(char *name, int hash_size, int tdb_flags,
int open_flags, mode_t mode);
-/* The following definitions come from utils/nbio.c */
+/* The following definitions come from torture/nbio.c */
void nb_setup(struct cli_state *cli);
void nb_unlink(char *fname);
@@ -4658,8 +4658,9 @@ void nb_rename(char *old, char *new);
void nb_stat(char *fname, int size);
void nb_create(char *fname, int size);
-/* The following definitions come from utils/torture.c */
+/* The following definitions come from torture/torture.c */
+void new_trans(struct cli_state *pcli, int fnum, int level);
/* The following definitions come from web/cgi.c */
diff --git a/source3/include/rpc_samr.h b/source3/include/rpc_samr.h
index 223299cfc5..d996170200 100644
--- a/source3/include/rpc_samr.h
+++ b/source3/include/rpc_samr.h
@@ -217,7 +217,6 @@ typedef struct sam_user_info_23
typedef struct sam_user_info_24
{
uint8 pass[516];
- uint16 passlen;
} SAM_USER_INFO_24;
diff --git a/source3/rpc_parse/parse_samr.c b/source3/rpc_parse/parse_samr.c
index e32a087a65..6e94b62d40 100644
--- a/source3/rpc_parse/parse_samr.c
+++ b/source3/rpc_parse/parse_samr.c
@@ -4997,12 +4997,10 @@ static BOOL sam_io_user_info11(char *desc, SAM_USER_INFO_11 * usr,
*************************************************************************/
-void init_sam_user_info24(SAM_USER_INFO_24 * usr,
- char newpass[516], uint16 passlen)
+void init_sam_user_info24(SAM_USER_INFO_24 * usr, char newpass[516])
{
- DEBUG(10, ("init_sam_user_info24: passlen: %d\n", passlen));
+ DEBUG(10, ("init_sam_user_info24:\n"));
memcpy(usr->pass, newpass, sizeof(usr->pass));
- usr->passlen = passlen;
}
/*******************************************************************
@@ -5025,9 +5023,6 @@ static BOOL sam_io_user_info24(char *desc, SAM_USER_INFO_24 * usr,
sizeof(usr->pass)))
return False;
- if (!prs_uint16("passlen", ps, depth, &usr->passlen))
- return False;
-
if(!prs_align(ps))
return False;