summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorGeorge Lebl <jirka@5z.com>2001-10-25 01:12:09 +0000
committerGeorge Lebl <jirka@src.gnome.org>2001-10-25 01:12:09 +0000
commit78b4c057ab0d18f45fd8c5302b60120112b1578e (patch)
tree961e13693ee8d4f8916aa59a1a4736a473099cce /utils
parent04eef84f74899f19fe10aa4d6a19554cfb85b6a3 (diff)
downloadgdm-78b4c057ab0d18f45fd8c5302b60120112b1578e.tar.gz
Don't pass extra arguments to XKeepsCrashing, and whack the X
Wed Oct 24 17:57:03 2001 George Lebl <jirka@5z.com> * daemon/gdm.[ch], gui/gdmconfig.(c|glade), config/gdm.conf.in: Don't pass extra arguments to XKeepsCrashing, and whack the X configurators option since that is now changed by editting the XKeepsCrashing script directly. * config/XKeepsCrashing, config/Makefile.am, config/gettextfoo.h, po/POTFILES.in, config/extract-shell.sh: Rework the XKeepsCrashing script, configurator is found from a list in the script. If the error is a mouse error try the mouseconfig configurator first. Messages are now gotten by gettext -s directly and extracted by a simple stupid script, that needs a tad of work still I think. * docs/C/gdm.sgml: Remove the XKeepsCrashingConfigurators option
Diffstat (limited to 'utils')
-rw-r--r--utils/Makefile.am15
-rw-r--r--utils/gdmmktemp.c (renamed from utils/gdmmkstemp.c)8
2 files changed, 15 insertions, 8 deletions
diff --git a/utils/Makefile.am b/utils/Makefile.am
index d047fb50..65524478 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -21,9 +21,12 @@ INCLUDES = \
sbin_PROGRAMS = \
@GDMASKPASS@ \
- @GDMOPEN@ \
- gdmmkstemp
-EXTRA_PROGRAMS = gdmaskpass gdmopen gdmmkstemp
+ @GDMOPEN@
+
+bin_PROGRAMS = \
+ gdmmktemp
+
+EXTRA_PROGRAMS = gdmaskpass gdmopen
gdmaskpass_SOURCES = \
gdmaskpass.c
@@ -31,8 +34,8 @@ gdmaskpass_SOURCES = \
gdmopen_SOURCES = \
gdmopen.c
-gdmmkstemp_SOURCES = \
- gdmmkstemp.c
+gdmmktemp_SOURCES = \
+ gdmmktemp.c
gdmaskpass_LDADD = \
$(GNOME_LIBDIR) \
@@ -44,6 +47,6 @@ gdmopen_LDADD = \
$(GNOME_LIBDIR) \
$(INTLLIBS)
-gdmmkstemp_LDADD = \
+gdmmktemp_LDADD = \
$(GNOME_LIBDIR) \
$(INTLLIBS)
diff --git a/utils/gdmmkstemp.c b/utils/gdmmktemp.c
index a93c8e01..dba23650 100644
--- a/utils/gdmmkstemp.c
+++ b/utils/gdmmktemp.c
@@ -13,6 +13,10 @@
#include "config.h"
#include <stdio.h>
#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
int
main (int argc, char *argv[])
@@ -24,9 +28,9 @@ main (int argc, char *argv[])
if (i < 0)
return 1;
- fchown (i, 0600);
+ fchmod (i, 0600);
printf ("%s\n", template);
- close (i)
+ close (i);
return 0;
}