summaryrefslogtreecommitdiff
path: root/source3/include/proto.h
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1997-10-06 17:52:25 +0000
committerJeremy Allison <jra@samba.org>1997-10-06 17:52:25 +0000
commit2e92be3aaf01c574d32d1a10e1359888638b68bc (patch)
tree5280182dda3e36282bd11699e022e015ad531bdc /source3/include/proto.h
parent8429cec72ff15efdd5ab742ba71ede36db43ef14 (diff)
downloadsamba-2e92be3aaf01c574d32d1a10e1359888638b68bc.tar.gz
samba-2e92be3aaf01c574d32d1a10e1359888638b68bc.tar.bz2
samba-2e92be3aaf01c574d32d1a10e1359888638b68bc.zip
client.c: Changed shadowed variable.
locking.c: Removed USE_OPLOCKS - now the default. params.c: Removed unused variable. proto.h: Updated. reply.c: Removed USE_OPLOCKS - now the default. server.c: Removed USE_OPLOCKS - now the default. smb.h: Removed USE_OPLOCKS - now the default. smbparse.c: Changed shadowed variable. status.c: Removed USE_OPLOCKS - now the default. util.c: Removed USE_OPLOCKS - now the default. Jeremy (jallison@whistle.com) (This used to be commit b93509846d6291771787af457500eec8984ee6bd)
Diffstat (limited to 'source3/include/proto.h')
-rw-r--r--source3/include/proto.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 9faecd3a00..202b151150 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -808,7 +808,7 @@ char* smb_io_chal(BOOL io, DOM_CHAL *chal, char *q, char *base, int align);
char* smb_io_cred(BOOL io, DOM_CRED *cred, char *q, char *base, int align);
char* smb_io_clnt_info(BOOL io, DOM_CLNT_INFO *clnt, char *q, char *base, int align);
char* smb_io_logon_id(BOOL io, DOM_LOGON_ID *log, char *q, char *base, int align);
-char* smb_io_rc4_owf(BOOL io, RC4_OWF *hash, char *q, char *base, int align);
+char* smb_io_arc4_owf(BOOL io, ARC4_OWF *hash, char *q, char *base, int align);
char* smb_io_id_info1(BOOL io, DOM_ID_INFO_1 *id, char *q, char *base, int align);
char* smb_io_sam_info(BOOL io, DOM_SAM_INFO *sam, char *q, char *base, int align);
char* smb_io_gid(BOOL io, DOM_GID *gid, char *q, char *base, int align);
@@ -1045,4 +1045,4 @@ void fstrcpy(char *dest, char *src);
void pstrcpy(char *dest, char *src);
char *align4(char *q, char *base);
char *align2(char *q, char *base);
-char *align_offset(char *q, char *base, int align_offset);
+char *align_offset(char *q, char *base, int align_offset_len);