From f97471cd9f3655a8b023a43c0856f02f80fea903 Mon Sep 17 00:00:00 2001 From: nalin Date: Dec 10 2001 20:40:13 +0000 Subject: read/write cache settings in the simple functions, too --- diff --git a/authinfo.c b/authinfo.c index 3b4fc41..ff68160 100644 --- a/authinfo.c +++ b/authinfo.c @@ -797,6 +797,7 @@ authInfoRead() authInfoReadLDAP(ret); authInfoReadKerberos(ret); authInfoReadNSS(ret); + authInfoReadCache(ret); authInfoReadPAM(ret); authInfoReadNetwork(ret); @@ -2266,17 +2267,18 @@ authInfoWriteNetwork(struct authInfoType *info) gboolean authInfoWrite(struct authInfoType *authInfo) { - gboolean ret = TRUE; - if(authInfo->enableKerberos) - ret = ret && authInfoWriteKerberos(authInfo); + gboolean ret; + ret = authInfoWriteCache(authInfo); if(authInfo->enableHesiod) ret = ret && authInfoWriteHesiod(authInfo); + if(authInfo->enableLDAP) + ret = ret && authInfoWriteLDAP(authInfo); + if(authInfo->enableKerberos) + ret = ret && authInfoWriteKerberos(authInfo); if(authInfo->enableNIS) ret = ret && authInfoWriteNIS(authInfo); if(authInfo->enableSMB) ret = ret && authInfoWriteSMB(authInfo); - if(authInfo->enableLDAP) - ret = ret && authInfoWriteLDAP(authInfo); ret = ret && authInfoWriteNSS(authInfo); ret = ret && authInfoWritePAM(authInfo); ret = ret && authInfoWriteNetwork(authInfo); @@ -2534,3 +2536,60 @@ void authInfoPost(struct authInfoType *authInfo, int nostart) toggleNisService(authInfo->enableNIS, authInfo->nisDomain, nostart); toggleCachingService(authInfo->enableCache, nostart); } + +void authInfoPrint(struct authInfoType *authInfo) +{ + printf("caching is %s\n", authInfo->enableCache ? "enabled" : "disabled"); + printf("nss_files is always enabled\n"); + printf("nss_hesiod is %s\n", + authInfo->enableHesiod ? "enabled" : "disabled"); + printf(" hesiod LHS = \"%s\"\n", + authInfo->hesiodLHS ? authInfo->hesiodLHS : ""); + printf(" hesiod RHS = \"%s\"\n", + authInfo->hesiodRHS ? authInfo->hesiodRHS : ""); + printf("nss_ldap is %s\n", + authInfo->enableLDAP ? "enabled" : "disabled"); + printf(" LDAP+TLS is %s\n", + authInfo->enableLDAPS ? "enabled" : "disabled"); + printf(" LDAP server = \"%s\"\n", + authInfo->ldapServer ? authInfo->ldapServer : ""); + printf(" LDAP base DN = \"%s\"\n", + authInfo->ldapBaseDN ? authInfo->ldapBaseDN : ""); + printf("nss_nis is %s\n", + authInfo->enableNIS ? "enabled" : "disabled"); + printf(" NIS server = \"%s\"\n", + authInfo->nisServer ? authInfo->nisServer : ""); + printf(" NIS domain = \"%s\"\n", + authInfo->nisDomain ? authInfo->nisDomain : ""); +#ifdef LOCAL_POLICIES + printf("local policies are %s\n", + authInfo->enableLocal ? "enabled" : "disabled"); +#endif + printf("pam_unix is always enabled\n"); + printf(" shadow passwords are %s\n", + authInfo->enableShadow ? "enabled" : "disabled"); + printf(" md5 passwords are %s\n", + authInfo->enableMD5 ? "enabled" : "disabled"); + printf("pam_krb5 is %s\n", + authInfo->enableKerberos ? "enabled" : "disabled"); + printf(" krb5 realm = \"%s\"\n", + authInfo->kerberosRealm ?: ""); + printf(" krb5 kdc = \"%s\"\n", + authInfo->kerberosKDC ?: ""); + printf(" krb5 admin server = \"%s\"\n", + authInfo->kerberosAdminServer ?: ""); + printf("pam_ldap is %s\n", + authInfo->enableLDAPAuth ? "enabled" : "disabled"); + printf(" LDAP+TLS is %s\n", + authInfo->enableLDAPS ? "enabled" : "disabled"); + printf(" LDAP server = \"%s\"\n", + authInfo->ldapServer ?: ""); + printf(" LDAP base DN = \"%s\"\n", + authInfo->ldapBaseDN ?: ""); + printf("pam_smb_auth is %s\n", + authInfo->enableSMB ? "enabled" : "disabled"); + printf(" SMB workgroup = \"%s\"\n", + authInfo->smbWorkgroup ?: ""); + printf(" SMB servers = \"%s\"\n", + authInfo->smbServers ?: ""); +}