projects / packages / autofs.git / blame
| Commit | Line | Data |
|---|---|---|
| 3d551623 PG |
1 | diff --git a/modules/lookup_file.c b/modules/lookup_file.c |
| 2 | index 1007de4..23ea07d 100644 | |
| 3 | --- a/modules/lookup_file.c | |
| 4 | +++ b/modules/lookup_file.c | |
| 5 | @@ -1088,8 +1088,9 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void * | |
| 6 | if (status == NSS_STATUS_COMPLETED) | |
| 7 | return NSS_STATUS_SUCCESS; | |
| 8 | ||
| 9 | - debug(ap->logopt, | |
| 10 | - MODPREFIX "check indirect map lookup failed"); | |
| 11 | + error(ap->logopt, | |
| 12 | + MODPREFIX "key \"%s\" not found in map", | |
| 13 | + name); | |
| 14 | ||
| 15 | return NSS_STATUS_NOTFOUND; | |
| 16 | } | |
| 17 | @@ -1130,7 +1131,9 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void * | |
| 18 | } | |
| 19 | cache_unlock(mc); | |
| 20 | } | |
| 21 | - } | |
| 22 | + } else | |
| 23 | + error(ap->logopt, | |
| 24 | + MODPREFIX "key \"%s\" not found in map.", name); | |
| 25 | ||
| 26 | if (ret) | |
| 27 | return NSS_STATUS_TRYAGAIN; | |
| 28 | diff --git a/modules/lookup_hesiod.c b/modules/lookup_hesiod.c | |
| 29 | index 649e24c..737a47e 100644 | |
| 30 | --- a/modules/lookup_hesiod.c | |
| 31 | +++ b/modules/lookup_hesiod.c | |
| 32 | @@ -129,8 +129,8 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void * | |
| 33 | if (!hes_result || !hes_result[0]) { | |
| 34 | /* Note: it is not clear to me how to distinguish between | |
| 35 | * the "no search results" case and other failures. --JM */ | |
| 36 | - warn(ap->logopt, | |
| 37 | - MODPREFIX "entry \"%s\" not found in map", name); | |
| 38 | + error(ap->logopt, | |
| 39 | + MODPREFIX "key \"%s\" not found in map", name); | |
| 40 | status = pthread_mutex_unlock(&hesiod_mutex); | |
| 41 | if (status) | |
| 42 | fatal(status); | |
| 43 | diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c | |
| 44 | index 4dea3b2..bad48bb 100644 | |
| 45 | --- a/modules/lookup_ldap.c | |
| 46 | +++ b/modules/lookup_ldap.c | |
| 47 | @@ -2089,8 +2089,9 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void * | |
| 48 | status = check_map_indirect(ap, lkp_key, strlen(lkp_key), ctxt); | |
| 49 | free(lkp_key); | |
| 50 | if (status) { | |
| 51 | - debug(ap->logopt, | |
| 52 | - MODPREFIX "check indirect map failure"); | |
| 53 | + error(ap->logopt, | |
| 54 | + MODPREFIX "key \"%s\" not found in map", | |
| 55 | + name); | |
| 56 | return status; | |
| 57 | } | |
| 58 | } | |
| 59 | @@ -2129,7 +2130,9 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void * | |
| 60 | } | |
| 61 | cache_unlock(mc); | |
| 62 | } | |
| 63 | - } | |
| 64 | + } else | |
| 65 | + error(ap->logopt, | |
| 66 | + MODPREFIX "key \"%s\" not found in map", name); | |
| 67 | ||
| 68 | if (ret) | |
| 69 | return NSS_STATUS_TRYAGAIN; | |
| 70 | diff --git a/modules/lookup_nisplus.c b/modules/lookup_nisplus.c | |
| 71 | index e948c14..bb1ca42 100644 | |
| 72 | --- a/modules/lookup_nisplus.c | |
| 73 | +++ b/modules/lookup_nisplus.c | |
| 74 | @@ -512,8 +512,9 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void * | |
| 75 | ||
| 76 | status = check_map_indirect(ap, lkp_key, strlen(lkp_key), ctxt); | |
| 77 | if (status) { | |
| 78 | - debug(ap->logopt, | |
| 79 | - MODPREFIX "check indirect map failure"); | |
| 80 | + error(ap->logopt, | |
| 81 | + MODPREFIX "key \"%s\" not found in map", | |
| 82 | + name); | |
| 83 | return status; | |
| 84 | } | |
| 85 | } | |
| 86 | @@ -551,7 +552,9 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void * | |
| 87 | } | |
| 88 | cache_unlock(mc); | |
| 89 | } | |
| 90 | - } | |
| 91 | + } else | |
| 92 | + error(ap->logopt, | |
| 93 | + MODPREFIX "key \"%s\" not found in map", name); | |
| 94 | ||
| 95 | if (ret) | |
| 96 | return NSS_STATUS_NOTFOUND; | |
| 97 | diff --git a/modules/lookup_yp.c b/modules/lookup_yp.c | |
| 98 | index 6c20145..e8ca8e8 100644 | |
| 99 | --- a/modules/lookup_yp.c | |
| 100 | +++ b/modules/lookup_yp.c | |
| 101 | @@ -604,8 +604,9 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void * | |
| 102 | status = check_map_indirect(ap, lkp_key, strlen(lkp_key), ctxt); | |
| 103 | free(lkp_key); | |
| 104 | if (status) { | |
| 105 | - debug(ap->logopt, | |
| 106 | - MODPREFIX "check indirect map lookup failed"); | |
| 107 | + error(ap->logopt, | |
| 108 | + MODPREFIX "key \"%s\" not found in map", | |
| 109 | + name); | |
| 110 | return status; | |
| 111 | } | |
| 112 | } | |
| 113 | @@ -643,7 +644,9 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void * | |
| 114 | } | |
| 115 | cache_unlock(mc); | |
| 116 | } | |
| 117 | - } | |
| 118 | + } else | |
| 119 | + error(ap->logopt, | |
| 120 | + MODPREFIX "key \"%s\" not found in map", name); | |
| 121 | ||
| 122 | if (ret) | |
| 123 | return NSS_STATUS_TRYAGAIN; |