sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

Added Kerberos4 support patches from Johan Hedin <johanh@fusion.kth.se>

Browse Source 
Jeremy.
This commit is contained in:
Jeremy Allison 0001-01-01 00:00:00 +00:00
parent b46f1024c9
commit 548634915f
7 changed files with 431 additions and 335 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
source/Makefile.in
View File

@ -12,6 +12,7 @@ INSTALL_MAN=$(prefix)/man
LIBS=@LIBS@
CC=@CC@
CFLAGS=@CFLAGS@
LDFLAGS=@LDFLAGS@
AWK=@AWK@
INSTALLCMD=@INSTALL@
@ -221,59 +222,59 @@ CHECK:
bin/smbd: $(SMBD_OBJ)
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(SMBD_OBJ) $(LIBS)
@$(CC) $(FLAGS) -o $@ $(SMBD_OBJ) $(LDFLAGS) $(LIBS)
bin/nmbd: $(NMBD_OBJ)
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(NMBD_OBJ) $(LIBS)
@$(CC) $(FLAGS) -o $@ $(NMBD_OBJ) $(LDFLAGS) $(LIBS)
bin/swat: $(SWAT_OBJ)
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(SWAT_OBJ) $(LIBS)
@$(CC) $(FLAGS) -o $@ $(SWAT_OBJ) $(LDFLAGS) $(LIBS)
bin/smbrun: $(SMBRUN_OBJ)
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(SMBRUN_OBJ) $(LIBS)
@$(CC) $(FLAGS) -o $@ $(SMBRUN_OBJ) $(LDFLAGS) $(LIBS)
bin/rpcclient: $(RPCCLIENT_OBJ)
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(RPCCLIENT_OBJ) $(LIBS)
@$(CC) $(FLAGS) -o $@ $(RPCCLIENT_OBJ) $(LDFLAGS) $(LIBS)
bin/smbclient: $(CLIENT_OBJ)
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LIBS)
@$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(LIBS)
bin/testparm: $(TESTPARM_OBJ)
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(TESTPARM_OBJ) $(LIBS)
@$(CC) $(FLAGS) -o $@ $(TESTPARM_OBJ) $(LDFLAGS) $(LIBS)
bin/testprns: $(TESTPRNS_OBJ)
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(TESTPRNS_OBJ) $(LIBS)
@$(CC) $(FLAGS) -o $@ $(TESTPRNS_OBJ) $(LDFLAGS) $(LIBS)
bin/smbstatus: $(STATUS_OBJ)
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(STATUS_OBJ) $(LIBS)
@$(CC) $(FLAGS) -o $@ $(STATUS_OBJ) $(LDFLAGS) $(LIBS)
bin/smbpasswd: $(SMBPASSWD_OBJ)
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(SMBPASSWD_OBJ) $(LIBS)
@$(CC) $(FLAGS) -o $@ $(SMBPASSWD_OBJ) $(LDFLAGS) $(LIBS)
bin/make_smbcodepage: $(MAKE_SMBCODEPAGE_OBJ)
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(MAKE_SMBCODEPAGE_OBJ) $(LIBS)
@$(CC) $(FLAGS) -o $@ $(MAKE_SMBCODEPAGE_OBJ) $(LDFLAGS) $(LIBS)
bin/nmblookup: $(NMBLOOKUP_OBJ)
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(NMBLOOKUP_OBJ) $(LIBS)
@$(CC) $(FLAGS) -o $@ $(NMBLOOKUP_OBJ) $(LDFLAGS) $(LIBS)
bin/make_printerdef: $(MAKE_PRINTERDEF_OBJ)
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(MAKE_PRINTERDEF_OBJ) $(LIBS)
@$(CC) $(FLAGS) -o $@ $(MAKE_PRINTERDEF_OBJ) $(LDFLAGS) $(LIBS)
bin/smbtorture: $(SMBTORTURE_OBJ)
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(SMBTORTURE_OBJ) $(LIBS)
@$(CC) $(FLAGS) -o $@ $(SMBTORTURE_OBJ) $(LDFLAGS) $(LIBS)
install: installbin installman installscripts installcp installswat

1
source/acconfig.h
View File

@ -67,3 +67,4 @@
#undef HAVE_LIBREADLINE
#undef HAVE_KERNEL_OPLOCKS
#undef HAVE_IRIX_SPECIFIC_CAPABILITIES
#undef KRB4_AUTH

4
source/auth/pass_check.c
View File

@ -542,6 +542,8 @@ static BOOL krb5_auth(char *user,char *password)
#endif /* KRB5_AUTH */
#ifdef KRB4_AUTH
#include <krb.h>
/*******************************************************************
check on Kerberos authentication
********************************************************************/
@ -555,7 +557,7 @@ static BOOL krb4_auth(char *user,char *password)
}
(void) slprintf(tkfile, sizeof(tkfile) - 1, "/tmp/samba_tkt_%d",
getpid());
(int)getpid());
krb_set_tkt_string(tkfile);
if (krb_verify_user(user, "", realm,

709
source/configure vendored
View File

File diff suppressed because it is too large Load Diff

15
source/configure.in
View File

@ -491,6 +491,21 @@ AC_ARG_WITH(dfs,
AC_MSG_RESULT(no)
)
#################################################
# check for Kerberos IV auth system
AC_MSG_CHECKING(whether to use Kerberos IV)
AC_ARG_WITH(krb4,
[ --with-krb4=base-dir Include Kerberos IV support
--whithout-krb4 Don't include Kerbers IV support (default)],
[ AC_MSG_RESULT(yes)
AC_DEFINE(KRB4_AUTH)
AC_CHECK_LIB(resolv, dn_expand)
LIBS="$LIBS -lkrb -ldes"
CFLAGS="$CFLAGS -I$withval/include"
LDFLAGS="$LDFLAGS -L$withval/lib"],
AC_MSG_RESULT(no)
)
#################################################
# check for automount support
AC_MSG_CHECKING(whether to use AUTOMOUNT)

4
source/include/config.h.in
View File

@ -124,6 +124,7 @@
#undef HAVE_LIBREADLINE
#undef HAVE_KERNEL_OPLOCKS
#undef HAVE_IRIX_SPECIFIC_CAPABILITIES
#undef KRB4_AUTH
/* The number of bytes in a int. */
#undef SIZEOF_INT
@ -506,5 +507,8 @@
/* Define if you have the readline library (-lreadline). */
#undef HAVE_LIBREADLINE
/* Define if you have the resolv library (-lresolv). */
#undef HAVE_LIBRESOLV
/* Define if you have the socket library (-lsocket). */
#undef HAVE_LIBSOCKET

4
source/passdb/pass_check.c
View File

@ -542,6 +542,8 @@ static BOOL krb5_auth(char *user,char *password)
#endif /* KRB5_AUTH */
#ifdef KRB4_AUTH
#include <krb.h>
/*******************************************************************
check on Kerberos authentication
********************************************************************/
@ -555,7 +557,7 @@ static BOOL krb4_auth(char *user,char *password)
}
(void) slprintf(tkfile, sizeof(tkfile) - 1, "/tmp/samba_tkt_%d",
getpid());
(int)getpid());
krb_set_tkt_string(tkfile);
if (krb_verify_user(user, "", realm,