diff options
| author | George Lebl <jirka@5z.com> | 2003-08-22 23:20:48 +0000 |
|---|---|---|
| committer | George Lebl <jirka@src.gnome.org> | 2003-08-22 23:20:48 +0000 |
| commit | 9bbd03df85082029a21aa7c20ac73a7f30e40744 (patch) | |
| tree | 6bd54ec7936b0b68f965f3ac84d49f0d1ba5f95e /daemon/auth.c | |
| parent | fb85fade85d21baf9a07f4f6d00eb5973d17ad35 (diff) | |
| download | gdm-9bbd03df85082029a21aa7c20ac73a7f30e40744.tar.gz | |
construct files properly using g_build_filename, add a utility for this
Fri Aug 22 16:11:15 2003 George Lebl <jirka@5z.com>
* daemon/misc.[ch], daemon/auth.c, daemon/filecheck.c, daemon/gdm.c,
daemon/server.c, daemon/slave.c: construct files properly using
g_build_filename, add a utility for this gdm_make_filename if
we want to build out of dir, name and extension. Fixes
bug #118040
* daemon/gdm.c, daemon/slave.c: remove unused variable
Diffstat (limited to 'daemon/auth.c')
| -rw-r--r-- | daemon/auth.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/daemon/auth.c b/daemon/auth.c index 073c99fd..d8cc516c 100644 --- a/daemon/auth.c +++ b/daemon/auth.c @@ -211,7 +211,7 @@ gdm_auth_secure_display (GdmDisplay *d) /* Make another authfile since the greeter can't read the server/user * readable file */ - d->authfile_gdm = g_strconcat (GdmServAuthDir, "/", d->name, ".Xauth", NULL); + d->authfile_gdm = gdm_make_filename (GdmServAuthDir, d->name, ".Xauth"); af_gdm = gdm_safe_fopen_w (d->authfile_gdm); if G_UNLIKELY (af_gdm == NULL) { @@ -228,7 +228,7 @@ gdm_auth_secure_display (GdmDisplay *d) } } else { /* gdm and xserver authfile can be the same, server will run as root */ - d->authfile = g_strconcat (GdmServAuthDir, "/", d->name, ".Xauth", NULL); + d->authfile = gdm_make_filename (GdmServAuthDir, d->name, ".Xauth"); af = gdm_safe_fopen_w (d->authfile); if G_UNLIKELY (af == NULL) { @@ -467,7 +467,7 @@ gdm_auth_user_add (GdmDisplay *d, uid_t user, const char *homedir) if ( ! ve_string_empty (GdmUserAuthDir) && strcmp (GdmUserAuthDir, "~") != 0) { if (strncmp (GdmUserAuthDir, "~/", 2) == 0) { - authdir = g_strconcat (homedir, &GdmUserAuthDir[1], NULL); + authdir = g_build_filename (homedir, &GdmUserAuthDir[2], NULL); } else { authdir = g_strdup (GdmUserAuthDir); automatic_tmp_dir = TRUE; |