Changeset c8d100bb03e0fe0501037b914fe3638afd593ee4

Timestamp:

03/06/10 16:56:23 (5 months ago)

Author:

Joshua Brindle <method@manicmethod.com>

Committer:

Joshua Brindle <method@manicmethod.com> 1267916183 -0500

Parent:

[955f8d8e288bbba32732a661d1db6b2c471ae91e]

Message:

Patch to run genhomedircon without looking at /etc/passwd

I want to change the default of libsemanage to not look for home
directories in getpwent. This patch allows you to set the flag
usepasswd=false in the semanage.conf file. and genhomedircon will only
setup the labeling of /home, /export/home and any confined users homedirs.

If this patch is not acceptable because libsemanage is being rewritten,
I would like the functionality to be added to the new libsemanage.

Files:

• libsemanage/src/conf-parse.y (modified) (4 diffs)
• libsemanage/src/conf-scan.l (modified) (1 diff)
• libsemanage/src/direct_api.c (modified) (1 diff)
• libsemanage/src/semanage_conf.h (modified) (1 diff)

libsemanage/src/conf-parse.y

@@ -58 +58 @@
-
-%token MODULE_STORE VERSION EXPAND_CHECK FILE_MODE SAVE_PREVIOUS SAVE_LINKED
-
+ USEPASSWD
-%token BZIP_BLOCKSIZE BZIP_SMALL
-%token VERIFY_MOD_START VERIFY_LINKED_START VERIFY_KERNEL_START BLOCK_END
@@ -83 +83 @@
-        |       save_linked
-        |       disable_genhomedircon
+        |       usepasswd
-        |       handle_unknown
-        |       bzip_blocksize
@@ -154 +155 @@
- }
-
+usepasswd: USEPASSWD '=' ARG {
+        if (strcasecmp($3, "false") == 0) {
+                current_conf->usepasswd = 0;
+        } else if (strcasecmp($3, "true") == 0) {
+                current_conf->usepasswd = 1;
+        } else {
+                yyerror("usepasswd can only be 'true' or 'false'");
+        }
+        free($3);
+ }
+
-handle_unknown: HANDLE_UNKNOWN '=' ARG {
-        if (strcasecmp($3, "deny") == 0) {
@@ -253 +265 @@
-        conf->expand_check = 1;
-        conf->handle_unknown = -1;
+        conf->usepasswd = 1;
-        conf->file_mode = 0644;
-        conf->bzip_blocksize = 9;

libsemanage/src/conf-scan.l

@@ -47 +47 @@
-save-linked       return SAVE_LINKED;
-disable-genhomedircon return DISABLE_GENHOMEDIRCON;
+usepasswd return USEPASSWD;
-handle-unknown    return HANDLE_UNKNOWN;
-bzip-blocksize  return BZIP_BLOCKSIZE;

libsemanage/src/direct_api.c

@@ -960 +960 @@
-        if (!sh->conf->disable_genhomedircon) {
-                if (out && (retval =
-1
+sh->conf->usepasswd
-                        ERR(sh, "semanage_genhomedircon returned error code %d.",
-                            retval);

libsemanage/src/semanage_conf.h

@@ -39 +39 @@
-        int save_linked;
-        int disable_genhomedircon;
+        int usepasswd;
-        int handle_unknown;
-        mode_t file_mode;