Changeset c1323f22c7ad93b975eb8b6a251b893bc88f240f

Timestamp:

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

Author:

Joshua Brindle <method@manicmethod.com>

Committer:

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

Parent:

[654dcb897e49908a958dae55cf29793412c4b390]

Message:

fixes to commit 847d27b8385ce77ac71df8aa58a2d298b33d1ea4

- implicit declaration of semanage_module_enabled()
- added nicer error messages when disabling or enabling modules already disabled or enabled
- fix comment

Signed-off-by: Joshua Brindle <method@manicmethod.com>

Files:

• libsemanage/src/direct_api.c (modified) (3 diffs)
• libsemanage/src/semanage_store.h (modified) (1 diff)

libsemanage/src/direct_api.c

@@ -1305 +1305 @@
-                }
-                base++;
-
-
+
+
+
+
+
+
+
+
-                        int len = strlen(module_filenames[i]) - strlen(DISABLESTR);
-                        char *enabled_name = calloc(1, len+1);
@@ -1337 +1343 @@
-}
-
-En
+Dis
- * of memory, -2 if module not found or could not be enabled. */
-static int semanage_direct_disable(semanage_handle_t * sh, char *module_name)
@@ -1357 +1363 @@
-                }
-                base++;
-
-
-
-
-
-
-
+
+
+
-                                retval = -2;
-                                goto cleanup;
+                        } else if (strcmp(base + name_len, ".pp") == 0) {
+                                char disabled_name[PATH_MAX];
+                                if (snprintf(disabled_name, PATH_MAX, "%s%s", 
+                                                        module_filenames[i], DISABLESTR) == PATH_MAX) {
+                                        ERR(sh, "Could not disable module file %s.",
+                                                        module_filenames[i]);
+                                        retval = -2;
+                                        goto cleanup;
+                                }
+                                if (rename(module_filenames[i], disabled_name) == -1) {
+                                        ERR(sh, "Could not disable module file %s.",
+                                                        module_filenames[i]);
+                                        retval = -2;
+                                }
+                                retval = 0;
+                                goto cleanup;
-                        }
-                        if (rename(module_filenames[i], disabled_name) == -1) {
-                                ERR(sh, "Could not disable module file %s.",
-                                    module_filenames[i]);
-                                retval = -2;
-                        }
-                        retval = 0;
-                        goto cleanup;
-                }
-        }

libsemanage/src/semanage_store.h

@@ -85 +85 @@
-                               char ***filenames, int *len);
-
+int semanage_module_enabled(const char *file);
-/* lock file routines */
-int semanage_get_trans_lock(semanage_handle_t * sh);