X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/5aff007d8fcfb4c6cc3c3627ae15f45562db7a0d..af203fee8e5328ac99e568123d2fe6047c738aae:/clients/authorize.c
diff --git a/clients/authorize.c b/clients/authorize.c
index 1a0717e..652db04 100644
--- a/clients/authorize.c
+++ b/clients/authorize.c
@@ -2,24 +2,24 @@
* This file is part of DisOrder
* Copyright (C) 2005, 2007, 2008 Richard Kettlewell
*
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program. If not, see .
+ */
+/** @file clients/authorize.c
+ * @brief Create a new login
*/
-#include
-#include "types.h"
+#include "common.h"
#include
#include
@@ -27,7 +27,6 @@
#include
#include
#include
-#include
#include "client.h"
#include "authorize.h"
@@ -57,7 +56,7 @@ int authorize(disorder_client *client, const char *user, const char *rights) {
if(!(pw = getpwnam(user)))
/* If it's a NIS world then /etc/passwd may be a lie, but it emphasizes
* that it's talking about the login user, not the DisOrder user */
- fatal(0, "no such user as %s in /etc/passwd", user);
+ disorder_fatal(0, "no such user as %s in /etc/passwd", user);
/* Choose a random password */
gcry_randomize(pwbin, sizeof pwbin, GCRY_STRONG_RANDOM);
@@ -69,46 +68,46 @@ int authorize(disorder_client *client, const char *user, const char *rights) {
/* Become the target user */
if(setegid(pw->pw_gid) < 0)
- fatal(errno, "setegid %lu", (unsigned long)pw->pw_gid);
+ disorder_fatal(errno, "setegid %lu", (unsigned long)pw->pw_gid);
if(seteuid(pw->pw_uid) < 0)
- fatal(errno, "seteuid %lu", (unsigned long)pw->pw_uid);
+ disorder_fatal(errno, "seteuid %lu", (unsigned long)pw->pw_uid);
/* Make sure the configuration directory exists*/
byte_xasprintf(&configdir, "%s/.disorder", pw->pw_dir);
if(mkdir(configdir, 02700) < 0) {
if(errno != EEXIST)
- fatal(errno, "creating %s", configdir);
+ disorder_fatal(errno, "creating %s", configdir);
}
/* Make sure the configuration file does not exist */
byte_xasprintf(&configpath, "%s/passwd", configdir);
if(lstat(configpath, &sb) == 0)
- fatal(0, "%s already exists", configpath);
+ disorder_fatal(0, "%s already exists", configpath);
if(errno != ENOENT)
- fatal(errno, " checking %s", configpath);
+ disorder_fatal(errno, " checking %s", configpath);
byte_xasprintf(&configpathtmp, "%s.new", configpath);
/* Create config file with mode 600 */
if((fd = open(configpathtmp, O_WRONLY|O_CREAT, 0600)) < 0)
- fatal(errno, "error creating %s", configpathtmp);
+ disorder_fatal(errno, "error creating %s", configpathtmp);
/* Write password */
if(!(fp = fdopen(fd, "w")))
- fatal(errno, "error calling fdopen");
+ disorder_fatal(errno, "error calling fdopen");
if(fprintf(fp, "password %s\n", pwhex) < 0
|| fclose(fp) < 0)
- fatal(errno, "error writing to %s", configpathtmp);
+ disorder_fatal(errno, "error writing to %s", configpathtmp);
/* Rename config file into place */
if(rename(configpathtmp, configpath) < 0)
- fatal(errno, "error renaming %s to %s", configpathtmp, configpath);
+ disorder_fatal(errno, "error renaming %s to %s", configpathtmp, configpath);
/* Put our identity back */
if(seteuid(old_uid) < 0)
- fatal(errno, "seteuid %lu", (unsigned long)old_uid);
+ disorder_fatal(errno, "seteuid %lu", (unsigned long)old_uid);
if(setegid(old_gid) < 0)
- fatal(errno, "setegid %lu", (unsigned long)old_gid);
+ disorder_fatal(errno, "setegid %lu", (unsigned long)old_gid);
return 0;
}