merge

ipa-client/ipa-install/ipa-client-install

@@ -157,6 +157,7 @@ def main():
     opts.append({'name':'empty', 'type':'empty'})
 
     ipaconf.newConf("/etc/ipa/ipa.conf", opts)
+    print "Created /etc/ipa/ipa.conf"
 
     # Configure ldap.conf
     ldapconf = ipaclient.ipachangeconf.IPAChangeConf("IPA Installer")
@@ -175,6 +176,7 @@ def main():
     opts.append({'name':'empty', 'type':'empty'})
     try:
         ldapconf.newConf("/etc/ldap.conf", opts)
+        print "Configured /etc/ldap.conf"
     except Exception, e:
         print "Configuration failed: " + str(e)
         return 1
@@ -235,9 +237,11 @@ def main():
         opts.append({'name':'appdefaults', 'type':'section', 'value':appopts})
 
         krbconf.newConf("/etc/krb5.conf", opts);
+        print "Configured /etc/krb5.conf for IPA realm " + ds.getRealmName()
 
     #Modify nsswitch to add nss_ldap
     run(["/usr/sbin/authconfig", "--enableldap", "--update"])
+    print "LDAP enabled"
 
     #Check nss_ldap is working properly
     if not options.on_master:
@@ -257,9 +261,11 @@ def main():
 
     #Modify pam to add pam_krb5
     run(["/usr/sbin/authconfig", "--enablekrb5", "--update"])
+    print "Kerberos 5 enabled"
 
     if options.conf_ntp and not options.on_master:
         ipaclient.ntpconf.config_ntp(ds.getServerName())
+        print "NTP enabled"
 
     print "Client configuration complete."
 

ipa-server/ipa-gui/ipagui/static/css/style_freeipa.css

@@ -1,7 +1,5 @@
 /* freeipa-specific styles */
 
-body { background-color: red !important !important; }
-
 #login {
   float:			right;
   padding-top:			15px;

ipa-server/ipa-gui/ipagui/static/css/style_platform-objects.css

@@ -1,4 +1,4 @@
-r/* object h1 styles */
+/* object h1 styles */
 
 #details h1.overview { background-image: url('/static/images/objects/object-overview.png'); }
 

ipa-server/selinux/Makefile

@@ -19,6 +19,7 @@ maintainer-clean: clean
 distclean: clean
 
 install: all
+	install -d $(POLICY_DIR)
 	install -m 644 ipa_webgui/ipa_webgui.pp $(POLICY_DIR)
 	install -m 644 ipa_kpasswd/ipa_kpasswd.pp $(POLICY_DIR)
 

ipa-server/selinux/ipa_kpasswd/ipa_kpasswd.te

@@ -44,7 +44,7 @@ corenet_udp_sendrecv_all_nodes(ipa_kpasswd_t)
 corenet_raw_sendrecv_all_nodes(ipa_kpasswd_t)
 corenet_tcp_sendrecv_all_ports(ipa_kpasswd_t)
 corenet_udp_sendrecv_all_ports(ipa_kpasswd_t)
-corenet_all_recvfrom_unlabeled(ipa_kpasswd_t)
+corenet_non_ipsec_sendrecv(ipa_kpasswd_t)
 corenet_tcp_bind_all_nodes(ipa_kpasswd_t)
 corenet_udp_bind_all_nodes(ipa_kpasswd_t)
 corenet_tcp_bind_kerberos_admin_port(ipa_kpasswd_t)

ipa-server/selinux/ipa_webgui/ipa_webgui.te

@@ -83,7 +83,7 @@ corenet_udp_sendrecv_all_nodes(ipa_webgui_t)
 corenet_raw_sendrecv_all_nodes(ipa_webgui_t)
 corenet_tcp_sendrecv_all_ports(ipa_webgui_t)
 corenet_udp_sendrecv_all_ports(ipa_webgui_t)
-corenet_all_recvfrom_unlabeled(ipa_webgui_t)
+corenet_non_ipsec_sendrecv(ipa_webgui_t)
 corenet_tcp_bind_all_nodes(ipa_webgui_t)
 corenet_udp_bind_all_nodes(ipa_webgui_t)
 corenet_tcp_bind_http_cache_port(ipa_webgui_t)