diff options
| author | Zhanna Tsitkov <tsitkova@mit.edu> | 2008-12-02 19:36:56 +0000 |
|---|---|---|
| committer | Zhanna Tsitkov <tsitkova@mit.edu> | 2008-12-02 19:36:56 +0000 |
| commit | b282e93924be15445fb48ab186da737d62a003f6 (patch) | |
| tree | 328987e352fa919f2eaeaebd2ef74d3b4b370883 | |
| parent | 265c82b5b88c752b54e953e2ed5e82524a5a1a70 (diff) | |
| download | krb5-b282e93924be15445fb48ab186da737d62a003f6.tar.gz krb5-b282e93924be15445fb48ab186da737d62a003f6.tar.xz krb5-b282e93924be15445fb48ab186da737d62a003f6.zip | |
Remove unneeded LEAN_CLIENT #define's
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@21261 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/lib/kdb/kdb_default.c | 12 | ||||
| -rw-r--r-- | src/util/profile/prof_init.c | 2 |
2 files changed, 0 insertions, 14 deletions
diff --git a/src/lib/kdb/kdb_default.c b/src/lib/kdb/kdb_default.c index 78d06a300..e1e54e307 100644 --- a/src/lib/kdb/kdb_default.c +++ b/src/lib/kdb/kdb_default.c @@ -144,10 +144,8 @@ krb5_def_store_mkey(krb5_context context, char defkeyfile[MAXPATHLEN+1]; char *tmp_ktname = NULL, *tmp_ktpath; krb5_data *realm = krb5_princ_realm(context, mname); -#ifndef LEAN_CLIENT krb5_keytab kt = NULL; krb5_keytab_entry new_entry; -#endif /* LEAN_CLIENT */ struct stat stb; int statrc; @@ -196,7 +194,6 @@ krb5_def_store_mkey(krb5_context context, goto out; } -#ifndef LEAN_CLIENT /* create new stash keytab using temp file name */ retval = krb5_kt_resolve(context, tmp_ktname, &kt); if (retval != 0) @@ -221,15 +218,12 @@ krb5_def_store_mkey(krb5_context context, tmp_ktpath, keyfile, error_message(errno)); } } -#endif /* LEAN_CLIENT */ out: if (tmp_ktname != NULL) free(tmp_ktname); -#ifndef LEAN_CLIENT if (kt) krb5_kt_close(context, kt); -#endif return retval; } @@ -314,7 +308,6 @@ krb5_db_def_fetch_mkey_stash(krb5_context context, return retval; } -#ifndef LEAN_CLIENT static krb5_error_code krb5_db_def_fetch_mkey_keytab(krb5_context context, const char *keyfile, @@ -378,7 +371,6 @@ errout: return retval; } -#endif /* LEAN_CLIENT */ krb5_error_code krb5_db_def_fetch_mkey(krb5_context context, @@ -402,19 +394,15 @@ krb5_db_def_fetch_mkey(krb5_context context, /* null terminate no matter what */ keyfile[sizeof(keyfile) - 1] = '\0'; -#ifndef LEAN_CLIENT /* assume the master key is in a keytab */ retval_kt = krb5_db_def_fetch_mkey_keytab(context, keyfile, mname, key, kvno); if (retval_kt != 0) { -#endif /* LEAN_CLIENT */ /* * If it's not in a keytab, fall back and try getting the mkey from the * older stash file format. */ retval_ofs = krb5_db_def_fetch_mkey_stash(context, keyfile, key, kvno); -#ifndef LEAN_CLIENT } -#endif /* LEAN_CLIENT */ if (retval_kt != 0 && retval_ofs != 0) { /* diff --git a/src/util/profile/prof_init.c b/src/util/profile/prof_init.c index 041ef747a..248ea5df0 100644 --- a/src/util/profile/prof_init.c +++ b/src/util/profile/prof_init.c @@ -253,7 +253,6 @@ profile_release(profile_t profile) free(profile); } -#ifndef LEAN_CLIENT /* * Here begins the profile serialization functions. */ @@ -400,5 +399,4 @@ cleanup: } return(retval); } -#endif /* LEAN_CLIENT */ |