summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/actions.c8
-rw-r--r--src/users.c1
-rw-r--r--version.log6
3 files changed, 12 insertions, 3 deletions
diff --git a/src/actions.c b/src/actions.c
index 1078ebe3f..9a4a2c23e 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -245,8 +245,12 @@ char *common_get_vident(User * u)
/* ptlink hack since there is no user mode
for vhost, simply compare the host to the
vhost struct memember */
- } else if (stricmp(u->vident, u->username)) {
- return u->vident;
+ } else if (u->vident) {
+ if (stricmp(u->vident, u->username)) {
+ return u->vident;
+ } else {
+ return u->username;
+ }
} else {
return u->username;
}
diff --git a/src/users.c b/src/users.c
index ec158bce1..74d78bf58 100644
--- a/src/users.c
+++ b/src/users.c
@@ -510,6 +510,7 @@ User *do_nick(const char *source, char *nick, char *username, char *host,
user->my_signon = time(NULL);
user->vhost = vhost ? sstrdup(vhost) : sstrdup(host);
user->uid = uid; /* p10 stuff */
+ user->vident = sstrdup(username);
if (CheckClones) {
/* Check to see if it looks like clones. */
diff --git a/version.log b/version.log
index b08dc5441..f3246f4c0 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,14 @@
VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="7"
-VERSION_BUILD="548"
+VERSION_BUILD="549"
# $Log$
#
+# BUILD : 1.7.7 (549)
+# BUGS : N/A
+# NOTES : Fixes a segfault with the last commit
+#
# BUILD : 1.7.7 (548)
# BUGS : N/A
# NOTES : Support for PTlinks VHOST (NEWMASK) command.