svn commit: samba r14512 - branches/SAMBA_3_0/source/libads
trunk/source/libads
jerry at samba.org
jerry at samba.org
Fri Mar 17 13:57:00 GMT 2006
Author: jerry
Date: 2006-03-17 13:57:00 +0000 (Fri, 17 Mar 2006)
New Revision: 14512
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14512
Log:
Guenther, This code breaks winbind with MIT krb1.3.
I'm disabling it for now until we have en effective
means of dealing with the ticket request flags for users
and computers.
Modified:
branches/SAMBA_3_0/source/libads/kerberos.c
trunk/source/libads/kerberos.c
Changeset:
Modified: branches/SAMBA_3_0/source/libads/kerberos.c
===================================================================
--- branches/SAMBA_3_0/source/libads/kerberos.c 2006-03-17 13:55:10 UTC (rev 14511)
+++ branches/SAMBA_3_0/source/libads/kerberos.c 2006-03-17 13:57:00 UTC (rev 14512)
@@ -72,7 +72,9 @@
krb5_ccache cc = NULL;
krb5_principal me;
krb5_creds my_creds;
+#if 0
krb5_get_init_creds_opt opt;
+#endif
initialize_krb5_error_table();
if ((code = krb5_init_context(&ctx)))
@@ -95,9 +97,12 @@
return code;
}
+#if 0 /* This code causes problems with MIT krb5 1.3 when asking for a
+ TGT for the machine account */
krb5_get_init_creds_opt_init(&opt);
krb5_get_init_creds_opt_set_renew_life(&opt, renewable_time);
krb5_get_init_creds_opt_set_forwardable(&opt, 1);
+#endif
if (request_pac) {
#ifdef HAVE_KRB5_GET_INIT_CREDS_OPT_SET_PAC_REQUEST
@@ -105,9 +110,14 @@
#endif
}
+#if 0
if ((code = krb5_get_init_creds_password(ctx, &my_creds, me, CONST_DISCARD(char *,password),
- kerb_prompter,
- NULL, 0, NULL, &opt))) {
+ kerb_prompter, NULL, 0, NULL, &opt)))
+#else
+ if ((code = krb5_get_init_creds_password(ctx, &my_creds, me, CONST_DISCARD(char *,password),
+ kerb_prompter, NULL, 0, NULL, NULL)))
+#endif
+ {
krb5_free_principal(ctx, me);
krb5_free_context(ctx);
return code;
Modified: trunk/source/libads/kerberos.c
===================================================================
--- trunk/source/libads/kerberos.c 2006-03-17 13:55:10 UTC (rev 14511)
+++ trunk/source/libads/kerberos.c 2006-03-17 13:57:00 UTC (rev 14512)
@@ -72,7 +72,9 @@
krb5_ccache cc = NULL;
krb5_principal me;
krb5_creds my_creds;
+#if 0
krb5_get_init_creds_opt opt;
+#endif
initialize_krb5_error_table();
if ((code = krb5_init_context(&ctx)))
@@ -95,9 +97,12 @@
return code;
}
+#if 0 /* This code causes problems with MIT krb5 1.3 when asking for a
+ TGT for the machine account */
krb5_get_init_creds_opt_init(&opt);
krb5_get_init_creds_opt_set_renew_life(&opt, renewable_time);
krb5_get_init_creds_opt_set_forwardable(&opt, 1);
+#endif
if (request_pac) {
#ifdef HAVE_KRB5_GET_INIT_CREDS_OPT_SET_PAC_REQUEST
@@ -105,9 +110,14 @@
#endif
}
+#if 0
if ((code = krb5_get_init_creds_password(ctx, &my_creds, me, CONST_DISCARD(char *,password),
- kerb_prompter,
- NULL, 0, NULL, &opt))) {
+ kerb_prompter, NULL, 0, NULL, &opt)))
+#else
+ if ((code = krb5_get_init_creds_password(ctx, &my_creds, me, CONST_DISCARD(char *,password),
+ kerb_prompter, NULL, 0, NULL, NULL)))
+#endif
+ {
krb5_free_principal(ctx, me);
krb5_free_context(ctx);
return code;
More information about the samba-cvs
mailing list