svn commit: samba r18028 - in branches/SAMBA_3_0/source/nsswitch: .
vlendec at samba.org
vlendec at samba.org
Mon Sep 4 09:29:50 GMT 2006
Author: vlendec
Date: 2006-09-04 09:29:50 +0000 (Mon, 04 Sep 2006)
New Revision: 18028
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18028
Log:
Fix warnings on non-krb5 systems
Modified:
branches/SAMBA_3_0/source/nsswitch/winbindd_cred_cache.c
branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_cred_cache.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_cred_cache.c 2006-09-04 08:55:58 UTC (rev 18027)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cred_cache.c 2006-09-04 09:29:50 UTC (rev 18028)
@@ -72,10 +72,12 @@
{
struct WINBINDD_CCACHE_ENTRY *entry =
talloc_get_type_abort(private_data, struct WINBINDD_CCACHE_ENTRY);
+#ifdef HAVE_KRB5
int ret;
time_t new_start;
struct timeval t;
struct WINBINDD_MEMORY_CREDS *cred_ptr = entry->cred_ptr;
+#endif
DEBUG(10,("krb5_ticket_refresh_handler called\n"));
DEBUGADD(10,("event called for: %s, %s\n", entry->ccname, entry->username));
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c 2006-09-04 08:55:58 UTC (rev 18027)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c 2006-09-04 09:29:50 UTC (rev 18028)
@@ -321,6 +321,8 @@
return NT_STATUS_OK;
}
+#ifdef HAVE_KRB5
+
static const char *generate_krb5_ccache(TALLOC_CTX *mem_ctx,
const char *type,
uid_t uid,
@@ -368,19 +370,6 @@
return gen_cc;
}
-static uid_t get_uid_from_state(struct winbindd_cli_state *state)
-{
- uid_t uid = -1;
-
- uid = state->request.data.auth.uid;
-
- if (uid < 0) {
- DEBUG(1,("invalid uid: '%d'\n", uid));
- return -1;
- }
- return uid;
-}
-
static void setup_return_cc_name(struct winbindd_cli_state *state, const char *cc)
{
const char *type = state->request.data.auth.krb5_cc_type;
@@ -401,6 +390,21 @@
fstrcpy(state->response.data.auth.krb5ccname, cc);
}
+#endif
+
+static uid_t get_uid_from_state(struct winbindd_cli_state *state)
+{
+ uid_t uid = -1;
+
+ uid = state->request.data.auth.uid;
+
+ if (uid < 0) {
+ DEBUG(1,("invalid uid: '%d'\n", uid));
+ return -1;
+ }
+ return uid;
+}
+
/**********************************************************************
Authenticate a user with a clear text password using Kerberos and fill up
ccache if required
@@ -1852,7 +1856,9 @@
struct winbindd_cli_state *state)
{
NTSTATUS result = NT_STATUS_NOT_SUPPORTED;
+#ifdef HAVE_KRB5
int ret;
+#endif
DEBUG(3, ("[%5lu]: pam dual logoff %s\n", (unsigned long)state->pid,
state->request.data.logoff.user));
More information about the samba-cvs
mailing list