浏览代码

permissions(k): do not check db con in child init

- proper connection is returned by comparison of pids
Daniel-Constantin Mierla 14 年之前
父节点
当前提交
be92c6713c
共有 2 个文件被更改,包括 3 次插入3 次删除
  1. 1 1
      modules_k/permissions/address.c
  2. 2 2
      modules_k/permissions/trusted.c

+ 1 - 1
modules_k/permissions/address.c

@@ -287,7 +287,7 @@ error:
  */
 int mi_init_addresses(void)
 {
-    if (!db_url.s || db_handle) return 0;
+    if (!db_url.s) return 0;
     db_handle = perm_dbf.init(&db_url);
     if (!db_handle) {
 	LM_ERR("unable to connect database\n");

+ 2 - 2
modules_k/permissions/trusted.c

@@ -235,7 +235,7 @@ int init_child_trusted(int rank)
     if ((rank <= 0) && (rank != PROC_RPC) && (rank != PROC_UNIXSOCK))
 		return 0;
 
-	if (!db_url.s || db_handle) {
+	if (!db_url.s) {
 		return 0;
 	}
 	
@@ -261,7 +261,7 @@ int init_child_trusted(int rank)
  */
 int mi_init_trusted(void)
 {
-    if (!db_url.s || db_handle) return 0;
+    if (!db_url.s) return 0;
     db_handle = perm_dbf.init(&db_url);
     if (!db_handle) {
 	LM_ERR("unable to connect database\n");