client.c: Changed shadowed variable.

[kai/samba.git] / source3 / include / proto.h

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 9faecd3a0038cf2bb3d4dd6cd74714b2d80e739d..202b1511504f6e1b9f5666b608dce56f34c2147a 100644 (file)
--- 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_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);
 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);
 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);