From 614e010daad98081bb7bd03289e9350a49ad81ce Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 3 Jun 2010 01:45:01 +0200 Subject: s3: remove authdata.h Guenther --- source3/include/authdata.h | 36 ------------------------------------ source3/libads/authdata.c | 1 - source3/libsmb/clikrb5.c | 9 ++++++++- 3 files changed, 8 insertions(+), 38 deletions(-) delete mode 100644 source3/include/authdata.h diff --git a/source3/include/authdata.h b/source3/include/authdata.h deleted file mode 100644 index f9578aa16b..0000000000 --- a/source3/include/authdata.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - Unix SMB/CIFS implementation. - Kerberos authorization data - Copyright (C) Jim McDonough 2003 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - -#ifndef _AUTHDATA_H -#define _AUTHDATA_H - -#define PAC_TYPE_LOGON_INFO 1 -#define PAC_TYPE_SERVER_CHECKSUM 6 -#define PAC_TYPE_PRIVSVR_CHECKSUM 7 -#define PAC_TYPE_LOGON_NAME 10 - -#ifndef KRB5_AUTHDATA_WIN2K_PAC -#define KRB5_AUTHDATA_WIN2K_PAC 128 -#endif - -#ifndef KRB5_AUTHDATA_IF_RELEVANT -#define KRB5_AUTHDATA_IF_RELEVANT 1 -#endif - -#endif diff --git a/source3/libads/authdata.c b/source3/libads/authdata.c index f76f6df15f..305b6072bc 100644 --- a/source3/libads/authdata.c +++ b/source3/libads/authdata.c @@ -25,7 +25,6 @@ #include "includes.h" #include "librpc/gen_ndr/ndr_krb5pac.h" #include "smb_krb5.h" -#include "authdata.h" #ifdef HAVE_KRB5 diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c index 04c9bbf829..098d633e62 100644 --- a/source3/libsmb/clikrb5.c +++ b/source3/libsmb/clikrb5.c @@ -20,9 +20,16 @@ along with this program. If not, see . */ +#ifndef KRB5_AUTHDATA_WIN2K_PAC +#define KRB5_AUTHDATA_WIN2K_PAC 128 +#endif + +#ifndef KRB5_AUTHDATA_IF_RELEVANT +#define KRB5_AUTHDATA_IF_RELEVANT 1 +#endif + #include "includes.h" #include "smb_krb5.h" -#include "authdata.h" #ifdef HAVE_KRB5 -- cgit