Do not exit when zlog init failed

Signed-off-by: wangxiaoqing <wangxiaoqing@kylinsec.com.cn>

0001-fix-kiran-authentication-service-Add-the-enable-zlog-de85f51c.patch

@@ -1,100 +0,0 @@
-From de85f51ca1127a06ed200fe6c7670ebb73a3587f Mon Sep 17 00:00:00 2001
-From: wangxiaoqing <wangxiaoqing@kylinos.com.cn>
-Date: Tue, 25 Jan 2022 16:46:27 +0800
-Subject: [PATCH] fix(kiran-authentication-service): Add the enable zlog ex
- macro for zlog
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-- 添加ENABLE_ZLOG_EX宏来兼容不同版本的zlog
-
-Signed-off-by: wangxiaoqing <wangxiaoqing@kylinos.com.cn>
----
- src/CMakeLists.txt       | 13 ++++++++++++-
- src/kiran-auth-service.c |  4 ++++
- src/main.c               | 16 ++++++++++++----
- 3 files changed, 28 insertions(+), 5 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index bfee007..b9bb3dc 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -4,10 +4,21 @@ find_package (OpenSSL REQUIRED)
- pkg_check_modules (GLIB2 REQUIRED glib-2.0)
- pkg_check_modules (GIO REQUIRED gio-2.0)
- pkg_check_modules (GIO_UNIX REQUIRED gio-unix-2.0)
--pkg_check_modules (ZLOG REQUIRED zlog)
- pkg_check_modules (GLIB_JSON REQUIRED json-glib-1.0)
- pkg_check_modules (KIRAN_CC_DAEMON REQUIRED kiran-cc-daemon)
- 
-+if (ENABLE_ZLOG_EX)
-+      pkg_search_module(ZLOG REQUIRED zlog)
-+      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_ZLOG_EX")
-+else()
-+      find_library(ZLOG_LIBRARY zlog)
-+      set (ZLOG_INCLUDE_DIRS "")
-+      set (ZLOG_LIBRARIES "${ZLOG_LIBRARY}")
-+endif()
-+
-+message("found zlog dirs: ${ZLOG_INCLUDE_DIRS}")
-+message("found zlog libs: ${ZLOG_LIBRARIES}")
-+
- find_library(PAM_LIBRARY pam)
- find_program(GDBUS_CODEGEN "gdbus-codegen")
- 
-diff --git a/src/kiran-auth-service.c b/src/kiran-auth-service.c
-index a41c89a..3a4408d 100644
---- a/src/kiran-auth-service.c
-+++ b/src/kiran-auth-service.c
-@@ -22,7 +22,11 @@
- #include <json-glib/json-glib.h>
- #include <kiran-cc-daemon/kiran-system-daemon/accounts-i.h>
- #include <security/pam_appl.h>
-+#ifdef ENABLE_ZLOG_EX
- #include <zlog_ex.h>
-+#else
-+#include <zlog.h>
-+#endif
- #include "authentication_i.h"
- #include "kiran-accounts-gen.h"
- #include "kiran-biometrics-gen.h"
-diff --git a/src/main.c b/src/main.c
-index d35501e..d64b571 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -14,7 +14,11 @@
- 
- #include <glib.h>
- #include <locale.h>
-+#ifdef ENABLE_ZLOG_EX
- #include <zlog_ex.h>
-+#else
-+#include <zlog.h>
-+#endif
- #include "kiran-auth-service.h"
- 
- int main(int argc, char *argv[])
-@@ -25,11 +29,15 @@ int main(int argc, char *argv[])
-     setlocale(LC_CTYPE, "");
-     setlocale(LC_MESSAGES, "");
- 
--    if (dzlog_init_ex(NULL,
--                      "kylinsec-system-app",
--                      "kiran-authentication",
--                      "kiran_authentication_manager") < 0)
-+#ifdef ENABLE_ZLOG_EX
-+    if (dzlog_init_ex (NULL, "kylinsec-system", "kiran-biometrics", "kiran_biometrics_manager") < 0)
-+#else
-+    if (dzlog_init("/etc/zlog.conf", "kylinsec-system") < 0)
-+#endif
-+    {
-+        g_error ("zlog init failed!");
-         return -1;
-+    }
- 
- #if !GLIB_CHECK_VERSION(2, 36, 0)
-     g_type_init();
--- 
-2.27.0
-

kiran-authentication-service.spec

@@ -1,14 +1,13 @@
 %global on_openeuler 1
 
 Name:          kiran-authentication-service
-Version:       0.0.1
+Version:       0.0.2
-Release:       2.kb4
+Release:       1
 Summary:       Kiran Desktop kiran authentication service
 License:       MulanPSL-2.0
 URL:           http://www.kylinsec.com.cn
 
 Source0:       %{name}-%{version}.tar.gz
-Patch1:        0001-fix-kiran-authentication-service-Add-the-enable-zlog-de85f51c.patch
 
 BuildRequires: glib2-devel
 %if 0%{?on_openeuler}
@@ -56,6 +55,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %{_libdir}/libkiran-authentication-service.so.0.0.1
 %{_libdir}/libkiran-authentication-service.so.0.1
 %{_libdir}/security/pam_kiran_authentication.so
+%{_datadir}/locale/zh_CN/LC_MESSAGES/kiran-authentication-service.mo
 
 
 %files devel
@@ -64,6 +64,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %{_libdir}/libkiran-authentication-service.so
 
 %changelog
+* Thu Oct 27 2022 wangxiaoqing <wangxiaoqing@kylinsec.com.cn> - 0.0.2-1
+- KYOS-B: Do not exit when zlog init failed.
+
 * Wed Aug 10 2022 luoqing <luoqing@kylinsec.com.cn> - 0.0.1-2.kb4
 - KYOS-F: Modify license and add yaml file.