[Selinux-commits] SF.net SVN: selinux: [2758] trunk/libsemanage/src/genhomedircon.c

[<ssm...@us...>]

Revision: 2758
          http://selinux.svn.sourceforge.net/selinux/?rev=2758&view=rev
Author:   ssmalley
Date:     2008-01-25 10:57:54 -0800 (Fri, 25 Jan 2008)

Log Message:
-----------
Author: Caleb Case
Email: cc...@tr...
Subject: libsemanage: genhomedircon remove error on missing HOME_DIR or HOME_ROOT v2
Date: Thu, 24 Jan 2008 16:05:44 -0500

Replacing failure condition in write_context_file when HOME_DIR or
HOME_ROOT are not found in the contexts. This condition is not needed
(the case where the lists are empty is handled correctly) and stops
otherwise valid operations:

On a fresh policy store, without any modules loaded:

# semodule -s refpolicy -b /usr/share/selinux/refpolicy/base.pp
libsemanage.semanage_install_sandbox: semanage_genhomedircon returned
error code -1. No such file or directory.
semodule:  Failed!

Failure is replaced with an early success return which happens when
HOME_DIR, HOME_ROOT, or USER are not found.

The list of homedirs is computed only if needed (HOME_DIR or HOME_ROOT
exist).

Modified Paths:
--------------
    trunk/libsemanage/src/genhomedircon.c

Modified: trunk/libsemanage/src/genhomedircon.c
===================================================================
--- trunk/libsemanage/src/genhomedircon.c	2008-01-24 20:43:51 UTC (rev 2757)
+++ trunk/libsemanage/src/genhomedircon.c	2008-01-25 18:57:54 UTC (rev 2758)
@@ -779,52 +779,60 @@
 	semanage_list_t *homeroot_context_tpl = NULL;
 	int retval = STATUS_SUCCESS;
 
-	homedirs = get_home_dirs(s);
-	if (!homedirs) {
-		WARN(s->h_semanage,
-		     "no home directories were available, exiting without writing");
-		return STATUS_ERR;	/* No homedirs so no output */
-	}
-
-	if (write_file_context_header(s, out) != STATUS_SUCCESS)
-		return STATUS_ERR;
-
 	homedir_context_tpl = make_template(s, &HOME_DIR_PRED);
 	homeroot_context_tpl = make_template(s, &HOME_ROOT_PRED);
 	user_context_tpl = make_template(s, &USER_CONTEXT_PRED);
 
+	if (!homedir_context_tpl && !homeroot_context_tpl && !user_context_tpl)
+		goto done;
+
+	if (write_file_context_header(s, out) != STATUS_SUCCESS) {
+		retval = STATUS_ERR;
+		goto done;
+	}
+
 	if (setup_fallback_user(s) != 0) {
 		retval = STATUS_ERR;
 		goto done;
 	}
-	for (h = homedirs; h; h = h->next) {
-		Ustr *temp = ustr_dup_cstr(h->data);
 
-		if (!temp || !ustr_add_cstr(&temp, "/[^/]*")) {
-			ustr_sc_free(&temp);
-			retval = STATUS_ERR;
+	if (homedir_context_tpl || homeroot_context_tpl) {
+		homedirs = get_home_dirs(s);
+		if (!homedirs) {
+			WARN(s->h_semanage,
+			     "no home directories were available, exiting without writing");
 			goto done;
 		}
 
-		if (write_home_dir_context(s, out,
-					   homedir_context_tpl,
-					   s->fallback_user, s->fallback_user,
-					   ustr_cstr(temp),
-					   s->fallback_user_prefix) !=
-		    STATUS_SUCCESS) {
+		for (h = homedirs; h; h = h->next) {
+			Ustr *temp = ustr_dup_cstr(h->data);
+
+			if (!temp || !ustr_add_cstr(&temp, "/[^/]*")) {
+				ustr_sc_free(&temp);
+				retval = STATUS_ERR;
+				goto done;
+			}
+
+			if (write_home_dir_context(s, out,
+						   homedir_context_tpl,
+						   s->fallback_user, s->fallback_user,
+						   ustr_cstr(temp),
+						   s->fallback_user_prefix) !=
+			    STATUS_SUCCESS) {
+				ustr_sc_free(&temp);
+				retval = STATUS_ERR;
+				goto done;
+			}
+			if (write_home_root_context(s, out,
+						    homeroot_context_tpl,
+						    h->data) != STATUS_SUCCESS) {
+				ustr_sc_free(&temp);
+				retval = STATUS_ERR;
+				goto done;
+			}
+
 			ustr_sc_free(&temp);
-			retval = STATUS_ERR;
-			goto done;
 		}
-		if (write_home_root_context(s, out,
-					    homeroot_context_tpl,
-					    h->data) != STATUS_SUCCESS) {
-			ustr_sc_free(&temp);
-			retval = STATUS_ERR;
-			goto done;
-		}
-
-		ustr_sc_free(&temp);
 	}
 	if (user_context_tpl) {
 		if (write_user_context(s, out, user_context_tpl,
@@ -840,7 +848,7 @@
 		}
 	}
 
-      done:
+done:
 	/* Cleanup */
 	semanage_list_destroy(&homedirs);
 	semanage_list_destroy(&user_context_tpl);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.