On Tue, May 12, 2009 at 11:50:28AM -0400, Daniel Ouellet wrote:
> The ret integer is define and assign a value a few times, however, never
> used, so could also be removed as well.
Currently it's not but it may be used for db error logging.
Index: aliases.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/aliases.c,v
retrieving revision 1.17
diff -u -p -r1.17 aliases.c
--- aliases.c 24 Apr 2009 10:02:35 -0000 1.17
+++ aliases.c 13 May 2009 12:10:17 -0000
@@ -56,21 +56,22 @@ aliases_exist(struct smtpd *env, char *u
return 0;
aliasesdb = dbopen(map->m_config, O_RDONLY, 0600, DB_HASH, NULL);
- if (aliasesdb == NULL)
+ if (aliasesdb == NULL) {
+ log_warn("aliases_exist: dbopen");
return 0;
+ }
lowercase(buf, username, sizeof(buf));
key.data = buf;
key.size = strlen(key.data) + 1;
- if ((ret = aliasesdb->get(aliasesdb, &key, &val, 0)) == -1) {
- aliasesdb->close(aliasesdb);
- return 0;
- }
+ ret = aliasesdb->get(aliasesdb, &key, &val, 0);
+ if (ret == -1)
+ log_warn("aliases_exist");
aliasesdb->close(aliasesdb);
- return ret == 0 ? 1 : 0;
+ return (ret == 0);
}
int
@@ -92,8 +93,10 @@ aliases_get(struct smtpd *env, struct al
return 0;
aliasesdb = dbopen(map->m_config, O_RDONLY, 0600, DB_HASH, NULL);
- if (aliasesdb == NULL)
+ if (aliasesdb == NULL) {
+ log_warn("aliases_get: dbopen");
return 0;
+ }
lowercase(buf, username, sizeof(buf));
@@ -101,6 +104,8 @@ aliases_get(struct smtpd *env, struct al
key.size = strlen(key.data) + 1;
if ((ret = aliasesdb->get(aliasesdb, &key, &val, 0)) != 0) {
+ if (ret == -1)
+ log_warn("aliases_get");
aliasesdb->close(aliasesdb);
return 0;
}
@@ -145,8 +150,10 @@ aliases_virtual_exist(struct smtpd *env,
return 0;
aliasesdb = dbopen(map->m_config, O_RDONLY, 0600, DB_HASH, NULL);
- if (aliasesdb == NULL)
+ if (aliasesdb == NULL) {
+ log_warn("aliases_virtual_exist: dbopen");
return 0;
+ }
if (! bsnprintf(strkey, sizeof(strkey), "%...@%s", path->user,
path->domain)) {
@@ -160,6 +167,8 @@ aliases_virtual_exist(struct smtpd *env,
key.size = strlen(key.data) + 1;
if ((ret = aliasesdb->get(aliasesdb, &key, &val, 0)) != 0) {
+ if (ret == -1)
+ log_warn("aliases_virtual_exist");
if (! bsnprintf(strkey, sizeof(strkey), "@%s", path->domain)) {
aliasesdb->close(aliasesdb);
@@ -171,14 +180,13 @@ aliases_virtual_exist(struct smtpd *env,
key.data = strkey;
key.size = strlen(key.data) + 1;
- if ((ret = aliasesdb->get(aliasesdb, &key, &val, 0)) != 0) {
- aliasesdb->close(aliasesdb);
- return 0;
- }
+ ret = aliasesdb->get(aliasesdb, &key, &val, 0);
}
+ if (ret == -1)
+ log_warn("aliases_virtual_exist");
aliasesdb->close(aliasesdb);
- return ret == 0 ? 1 : 0;
+ return (ret == 0);
}
int
@@ -201,8 +209,10 @@ aliases_virtual_get(struct smtpd *env, s
return 0;
aliasesdb = dbopen(map->m_config, O_RDONLY, 0600, DB_HASH, NULL);
- if (aliasesdb == NULL)
+ if (aliasesdb == NULL) {
+ log_warn("aliases_virtual_get: dbopen");
return 0;
+ }
if (! bsnprintf(strkey, sizeof(strkey), "%...@%s", path->user,
path->domain)) {
@@ -216,6 +226,8 @@ aliases_virtual_get(struct smtpd *env, s
key.size = strlen(key.data) + 1;
if ((ret = aliasesdb->get(aliasesdb, &key, &val, 0)) != 0) {
+ if (ret == -1)
+ log_warn("aliases_virtual_get");
if (! bsnprintf(strkey, sizeof(strkey), "@%s", path->domain)) {
aliasesdb->close(aliasesdb);
@@ -228,6 +240,8 @@ aliases_virtual_get(struct smtpd *env, s
key.size = strlen(key.data) + 1;
if ((ret = aliasesdb->get(aliasesdb, &key, &val, 0)) != 0) {
+ if (ret == -1)
+ log_warn("aliases_virtual_get");
aliasesdb->close(aliasesdb);
return 0;
}
@@ -271,7 +285,7 @@ aliases_expand_include(struct aliaseslis
fp = fopen(filename, "r");
if (fp == NULL) {
- log_warnx("failed to open include file \"%s\".", filename);
+ log_warn("failed to open include file \"%s\".", filename);
return 0;
}
Index: map.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/map.c,v
retrieving revision 1.5
diff -u -p -r1.5 map.c
--- map.c 6 Mar 2009 23:38:18 -0000 1.5
+++ map.c 13 May 2009 12:10:17 -0000
@@ -76,13 +76,16 @@ map_dblookup(struct smtpd *env, char *ma
}
db = dbopen(map->m_config, O_RDONLY, 0600, DB_HASH, NULL);
- if (db == NULL)
+ if (db == NULL) {
+ log_warn("map_dblookup: can't open %s", map->m_config);
return NULL;
+ }
key.data = keyname;
key.size = strlen(key.data) + 1;
if ((ret = db->get(db, &key, &val, 0)) == -1) {
+ log_warn("map_dblookup: map '%s'", mapname);
db->close(db);
return NULL;
}
