From 8b3f08cefcd41e6f8005de84a2cc865c1011194d Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 26 May 2004 05:40:33 +0000 Subject: r898: - remove some unused macros - remove unused lib/smbpasswd.c - don't set the pkt size twice when doing SMB signing (This used to be commit 69a2942f7987647a32d43c71f41ac1a82a82ccda) --- source4/include/includes.h | 10 ------- source4/include/smb.h | 63 -------------------------------------------- source4/include/smb_macros.h | 10 ------- 3 files changed, 83 deletions(-) (limited to 'source4/include') diff --git a/source4/include/includes.h b/source4/include/includes.h index 441111ed6f..5aa46c36cf 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -436,12 +436,6 @@ typedef int socklen_t; #define uchar unsigned char #endif -#ifdef HAVE_UNSIGNED_CHAR -#define schar signed char -#else -#define schar char -#endif - /* Samba needs type definitions for int8_t, int16_t, int32_t, int64_t @@ -711,10 +705,6 @@ typedef int (*comparison_fn_t)(const void *, const void *); #define MAP_FILE 0 #endif -#if (!defined(WITH_LDAP) && !defined(WITH_TDB_SAM)) -#define USE_SMBPASS_DB 1 -#endif - #if defined(HAVE_PUTPRPWNAM) && defined(AUTH_CLEARTEXT_SEG_CHARS) #define OSF1_ENH_SEC 1 #endif diff --git a/source4/include/smb.h b/source4/include/smb.h index 45a7bd0b2f..c6866c52b4 100644 --- a/source4/include/smb.h +++ b/source4/include/smb.h @@ -44,12 +44,6 @@ typedef int BOOL; #define _BOOL /* So we don't typedef BOOL again in vfs.h */ #endif -#define SIZEOFWORD 2 - -#ifndef DEF_CREATE_MASK -#define DEF_CREATE_MASK (0755) -#endif - /* string manipulation flags - see clistr.c and srvstr.c */ #define STR_TERMINATE 1 #define STR_UPPER 2 @@ -238,8 +232,6 @@ typedef smb_ucs2_t wfstring[FSTRING_LEN]; /* turn a 7 bit character into a ucs2 character */ #define UCS2_CHAR(c) ((c) << UCS2_SHIFT) -#define MAX_HOURS_LEN 32 - /* for compatibility */ #define SID_NAME_USE samr_SidType @@ -261,12 +253,6 @@ typedef struct nt_user_token { struct dom_sid **user_sids; } NT_USER_TOKEN; -/* 32 bit time (sec) since 01jan1970 - cifs6.txt, section 3.5, page 30 */ -typedef struct time_info -{ - uint32_t time; -} UTIME; - /* used to hold an arbitrary blob of data */ typedef struct data_blob { uint8_t *data; @@ -686,18 +672,6 @@ struct bitmap { otherwise NT will not honour the announce packets */ #define MAX_SERVER_STRING_LENGTH 48 - -#define SMB_SUCCESS 0 /* The request was successful. */ - -#ifdef WITH_DFS -void dfs_unlogin(void); -extern int dcelogin_atmost_once; -#endif - -#ifdef NOSTRDUP -char *strdup(char *s); -#endif - #ifndef SIGNAL_CAST #define SIGNAL_CAST (RETSIGTYPE (*)(int)) #endif @@ -892,28 +866,6 @@ struct node_status { unsigned char flags; }; -struct pwd_info -{ - BOOL null_pwd; - BOOL cleartext; - BOOL crypted; - - fstring password; - - uchar smb_lm_pwd[16]; - uchar smb_nt_pwd[16]; - - uchar smb_lm_owf[24]; - uchar smb_nt_owf[128]; - size_t nt_owf_len; - - uchar lm_cli_chal[8]; - uchar nt_cli_chal[128]; - size_t nt_cli_chal_len; - - uchar sess_key[16]; -}; - #include "rpc_secdes.h" typedef struct user_struct @@ -931,23 +883,8 @@ typedef struct user_struct } user_struct; -struct unix_error_map { - int unix_error; - int dos_class; - int dos_code; - NTSTATUS nt_error; -}; - #include "client.h" -/* - * Size of new password account encoding string. This is enough space to - * hold 11 ACB characters, plus the surrounding [] and a terminating null. - * Do not change unless you are adding new ACB bits! - */ - -#define NEW_PW_FORMAT_SPACE_PADDED_LEN 14 - /* Do you want session setups at user level security with a invalid password to be rejected or allowed in as guest? WinNT rejects them diff --git a/source4/include/smb_macros.h b/source4/include/smb_macros.h index 6dc78a1795..bbf904fbfa 100644 --- a/source4/include/smb_macros.h +++ b/source4/include/smb_macros.h @@ -108,20 +108,10 @@ /* these are the datagram types */ #define DGRAM_DIRECT_UNIQUE 0x10 -#define ERROR_DOS(class,code) error_packet(outbuf,NT_STATUS_OK,class,code,__LINE__,__FILE__) -#define ERROR_NT(status) error_packet(outbuf,status,0,0,__LINE__,__FILE__) -#define ERROR_BOTH(status,class,code) error_packet(outbuf,status,class,code,__LINE__,__FILE__) - -/* this is how errors are generated */ -#define UNIXERROR(defclass,deferror) unix_error_packet(outbuf,defclass,deferror,__LINE__,__FILE__) /* REWRITE TODO: remove these smb_xxx macros */ #define smb_buf(buf) (((char *)(buf)) + MIN_SMB_SIZE + CVAL(buf,HDR_WCT+4)*2) -/* the remaining number of bytes in smb buffer 'buf' from pointer 'p'. */ -#define smb_bufrem(buf, p) (smb_buflen(buf)-PTR_DIFF(p, smb_buf(buf))) - - #define smb_len(buf) (PVAL(buf,3)|(PVAL(buf,2)<<8)|(PVAL(buf,1)<<16)) #define _smb_setlen(buf,len) do {(buf)[0] = 0; (buf)[1] = ((len)&0x10000)>>16; \ (buf)[2] = ((len)&0xFF00)>>8; (buf)[3] = (len)&0xFF;} while (0) -- cgit