Merge pull request #244 from patsoffice/patsoffice/dir-perm-fix-RH-version

Change mkdir permissions to 0770, adjust umask

6 files changed, 15 insertions, 15 deletions

diff --git a/libopeniscsiusr/idbm.c b/libopeniscsiusr/idbm.c
index 060196f..0910c63 100644
--- a/libopeniscsiusr/idbm.c
+++ b/libopeniscsiusr/idbm.c
@@ -322,7 +322,7 @@ int _idbm_lock(struct iscsi_context *ctx)
 	}
 
 	if (access(LOCK_DIR, F_OK) != 0) {
-		if (mkdir(LOCK_DIR, 0660) != 0) {
+		if (mkdir(LOCK_DIR, 0770) != 0) {
 			_error(ctx, "Could not open %s: %d %s", LOCK_DIR, errno,
 				_strerror(errno, strerr_buff));
 			return LIBISCSI_ERR_IDBM;
diff --git a/libopeniscsiusr/iface.c b/libopeniscsiusr/iface.c
index e7938a5..4d573fb 100644
--- a/libopeniscsiusr/iface.c
+++ b/libopeniscsiusr/iface.c
@@ -326,7 +326,7 @@ int iscsi_default_iface_setup(struct iscsi_context *ctx)
 	_good(_idbm_lock(ctx), rc, out);
 
 	if ((access(IFACE_CONFIG_DIR, F_OK) != 0) &&
-	    (mkdir(IFACE_CONFIG_DIR, 0660) != 0)) {
+	    (mkdir(IFACE_CONFIG_DIR, 0770) != 0)) {
 		errno_save = errno;
 		_idbm_unlock(ctx);
 		_error(ctx, "Could not make %s folder(%d %s). "
diff --git a/usr/idbm.c b/usr/idbm.c
index 10eb8e2..b94b617 100644
--- a/usr/idbm.c
+++ b/usr/idbm.c
@@ -1455,7 +1455,7 @@ int idbm_lock(void)
 	}
 
 	if (access(LOCK_DIR, F_OK) != 0) {
-		if (mkdir(LOCK_DIR, 0660) != 0) {
+		if (mkdir(LOCK_DIR, 0770) != 0) {
 			log_error("Could not open %s: %s", LOCK_DIR,
 				  strerror(errno));
 			return ISCSI_ERR_IDBM;
@@ -2137,7 +2137,7 @@ static FILE *idbm_open_rec_w(char *portal, char *config)
 		}
 
 mkdir_portal:
-		if (mkdir(portal, 0660) != 0) {
+		if (mkdir(portal, 0770) != 0) {
 			log_error("Could not make dir %s err %d",
 				  portal, errno);
 			return NULL;
@@ -2172,7 +2172,7 @@ static int idbm_rec_write(node_rec_t *rec, bool disable_lock)
 
 	snprintf(portal, PATH_MAX, "%s", NODE_CONFIG_DIR);
 	if (access(portal, F_OK) != 0) {
-		if (mkdir(portal, 0660) != 0) {
+		if (mkdir(portal, 0770) != 0) {
 			log_error("Could not make %s: %s", portal,
 				  strerror(errno));
 			rc = ISCSI_ERR_IDBM;
@@ -2182,7 +2182,7 @@ static int idbm_rec_write(node_rec_t *rec, bool disable_lock)
 
 	snprintf(portal, PATH_MAX, "%s/%s", NODE_CONFIG_DIR, rec->name);
 	if (access(portal, F_OK) != 0) {
-		if (mkdir(portal, 0660) != 0) {
+		if (mkdir(portal, 0770) != 0) {
 			log_error("Could not make %s: %s", portal,
 				  strerror(errno));
 			rc = ISCSI_ERR_IDBM;
@@ -2242,7 +2242,7 @@ mkdir_portal:
 	snprintf(portal, PATH_MAX, "%s/%s/%s,%d,%d", NODE_CONFIG_DIR,
 		 rec->name, rec->conn[0].address, rec->conn[0].port, rec->tpgt);
 	if (stat(portal, &statb)) {
-		if (mkdir(portal, 0660) != 0) {
+		if (mkdir(portal, 0770) != 0) {
 			log_error("Could not make dir %s: %s",
 				  portal, strerror(errno));
 			rc = ISCSI_ERR_IDBM;
@@ -2294,7 +2294,7 @@ idbm_discovery_write(discovery_rec_t *rec)
 	snprintf(portal, PATH_MAX, "%s",
 		 disc_type_to_config_vals[rec->type].config_root);
 	if (access(portal, F_OK) != 0) {
-		if (mkdir(portal, 0660) != 0) {
+		if (mkdir(portal, 0770) != 0) {
 			log_error("Could not make %s: %s", portal,
 				  strerror(errno));
 			rc = ISCSI_ERR_IDBM;
@@ -2353,7 +2353,7 @@ static int setup_disc_to_node_link(char *disc_portal, node_rec_t *rec)
 		break;
 	case DISCOVERY_TYPE_FW:
 		if (access(FW_CONFIG_DIR, F_OK) != 0) {
-			if (mkdir(FW_CONFIG_DIR, 0660) != 0) {
+			if (mkdir(FW_CONFIG_DIR, 0770) != 0) {
 				log_error("Could not make %s: %s",
 					  FW_CONFIG_DIR, strerror(errno));
 				rc = ISCSI_ERR_IDBM;
@@ -2367,7 +2367,7 @@ static int setup_disc_to_node_link(char *disc_portal, node_rec_t *rec)
 		break;
 	case DISCOVERY_TYPE_STATIC:
 		if (access(STATIC_CONFIG_DIR, F_OK) != 0) {
-			if (mkdir(STATIC_CONFIG_DIR, 0660) != 0) {
+			if (mkdir(STATIC_CONFIG_DIR, 0770) != 0) {
 				log_error("Could not make %s; %s",
 					  STATIC_CONFIG_DIR, strerror(errno));
 				rc = ISCSI_ERR_IDBM;
@@ -2381,7 +2381,7 @@ static int setup_disc_to_node_link(char *disc_portal, node_rec_t *rec)
 		break;
 	case DISCOVERY_TYPE_ISNS:
 		if (access(ISNS_CONFIG_DIR, F_OK) != 0) {
-			if (mkdir(ISNS_CONFIG_DIR, 0660) != 0) {
+			if (mkdir(ISNS_CONFIG_DIR, 0770) != 0) {
 				log_error("Could not make %s: %s",
 					  ISNS_CONFIG_DIR, strerror(errno));
 				rc = ISCSI_ERR_IDBM;
@@ -3026,7 +3026,7 @@ int idbm_init(idbm_get_config_file_fn *fn)
 {
 	/* make sure root db dir is there */
 	if (access(ISCSI_CONFIG_ROOT, F_OK) != 0) {
-		if (mkdir(ISCSI_CONFIG_ROOT, 0660) != 0) {
+		if (mkdir(ISCSI_CONFIG_ROOT, 0770) != 0) {
 			log_error("Could not make %s %d", ISCSI_CONFIG_ROOT,
 				   errno);
 			return errno;
diff --git a/usr/iface.c b/usr/iface.c
index 11f3d2a..21d52b3 100644
--- a/usr/iface.c
+++ b/usr/iface.c
@@ -551,7 +551,7 @@ void iface_setup_host_bindings(void)
 		return;
 
 	if (access(IFACE_CONFIG_DIR, F_OK) != 0) {
-		if (mkdir(IFACE_CONFIG_DIR, 0660) != 0) {
+		if (mkdir(IFACE_CONFIG_DIR, 0770) != 0) {
 			log_error("Could not make %s. HW/OFFLOAD iscsi "
 				  "may not be supported", IFACE_CONFIG_DIR);
 			idbm_unlock();
diff --git a/usr/iscsiadm.c b/usr/iscsiadm.c
index 3987168..4249af8 100644
--- a/usr/iscsiadm.c
+++ b/usr/iscsiadm.c
@@ -3610,7 +3610,7 @@ main(int argc, char **argv)
 	sa_new.sa_flags = 0;
 	sigaction(SIGINT, &sa_new, &sa_old );
 
-	umask(0177);
+	umask(0077);
 
 	/* enable stdout logging */
 	log_init(program_name, 1024, log_do_log_std, NULL);
diff --git a/usr/iscsid.c b/usr/iscsid.c
index 6b46f8f..dc54fec 100644
--- a/usr/iscsid.c
+++ b/usr/iscsid.c
@@ -457,7 +457,7 @@ int main(int argc, char *argv[])
 		exit(ISCSI_ERR);
 	}
 
-	umask(0177);
+	umask(0077);
 
 	mgmt_ipc_fd = -1;
 	control_fd = -1;