r18028: Fix warnings on non-krb5 systems

(This used to be commit 30df6cb65f2dcc1829ea362ea0bc2a5e10f9819a)

diff --git a/source3/nsswitch/winbindd_cred_cache.c b/source3/nsswitch/winbindd_cred_cache.c
index e107b82a04365e58e0f1211b27920c660a1d281d..ddf4de6754c8e236958dcb1b6a18fc811607a813 100644 (file)
--- a/source3/nsswitch/winbindd_cred_cache.c
+++ b/source3/nsswitch/winbindd_cred_cache.c
@@ -72,10 +72,12 @@ static void krb5_ticket_refresh_handler(struct timed_event *te,
 {
        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));

diff --git a/source3/nsswitch/winbindd_pam.c b/source3/nsswitch/winbindd_pam.c
index dbd52092efcc1dd706d3e3e40a490ac9f51d25ea..14975141b2627ba0c9897bdb121bc7b603b5a1b2 100644 (file)
--- a/source3/nsswitch/winbindd_pam.c
+++ b/source3/nsswitch/winbindd_pam.c
@@ -321,6 +321,8 @@ static NTSTATUS get_pwd_properties(struct winbindd_domain *domain,
        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 @@ static const char *generate_krb5_ccache(TALLOC_CTX *mem_ctx,
        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 @@ static void setup_return_cc_name(struct winbindd_cli_state *state, const char *c
        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 @@ enum winbindd_result winbindd_dual_pam_logoff(struct winbindd_domain *domain,
                                              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));