Index: /branches/rel_apv_10_7/usr/click/bin/backend/ntp.c
===================================================================
--- /branches/rel_apv_10_7/usr/click/bin/backend/ntp.c	(revision 38997)
+++ /branches/rel_apv_10_7/usr/click/bin/backend/ntp.c	(working copy)
@@ -174,20 +174,24 @@
     return found;
 }
 
-static void print_ntp_servers() {
+static void print_ntp_servers()
+{
     FILE *fp = NULL;
     char buffer[1024];
 
     fp = fopen(CHRONY_CONF_FILE, "r");
-    if (fp) {
-        printf("\n");
-        while (fgets(buffer, sizeof(buffer), fp)) {
-            if(strncmp(buffer, "server", 6) == 0) {
-                printf("%s", buffer);
-            }
+    if (!fp) {
+        printf("%s:%s -- Failed to open chrony keys file \n", __FILE__, __FUNCTION__);
+        return;
+    }
+
+    printf("\n");
+    while (fgets(buffer, sizeof(buffer), fp)) {
+        if(strncmp(buffer, "server", 6) == 0) {
+            printf("%s", buffer);
         }
-        printf("\n");
     }
+    printf("\n");
 
     fclose(fp);
 }
@@ -507,8 +511,18 @@
 
     size = get_conf_file_size(CHRONY_CONF_FILE) + get_conf_file_size(CHRONY_KEYS_FILE) + strlen("ntp off\n");
     buf = calloc(size, sizeof(char));
+    if (!buf) {
+        printf("%s:%s -- Failed to allocate memory\n", __FILE__, __FUNCTION__);
+        return NULL;
+    }
 
     fp = fopen(CHRONY_KEYS_FILE, "r");
+    if (!fp) {
+        printf("%s:%s -- Failed to open chrony keys file \n", __FILE__, __FUNCTION__);
+        free(buf);
+        return NULL;
+    }
+
     while(fgets(linebuf, sizeof(linebuf), fp)) {
         if(linebuf[0] != '#' && linebuf[0] != '\n') {
             sscanf(linebuf, "%d %s %s", &key_id, algorithm, key_str);
@@ -519,6 +533,12 @@
     fclose(fp);
 
     fp = fopen(CHRONY_CONF_FILE, "r");
+    if (!fp) {
+        printf("%s:%s -- Failed to open chrony conf file \n", __FILE__, __FUNCTION__);
+        free(buf);
+        return NULL;
+    }
+
     while(fgets(linebuf, sizeof(linebuf), fp)) {
         if (strstr(linebuf, "server")){
             char *copy = strdup(linebuf);