* make the user const

diff --git a/citadel/include/ctdl_module.h b/citadel/include/ctdl_module.h
index e4973849a62c3d7fc3b4735801c2c2f17d904e03..83a51c2a9d0908497b8f0053d96af0a415d54172 100644 (file)
--- a/citadel/include/ctdl_module.h
+++ b/citadel/include/ctdl_module.h
@@ -302,7 +302,7 @@ extern struct config config;
 /*
  * Expose API calls from user_ops.c
  */
-int CtdlGetUser(struct ctdluser *usbuf, char name[]);
+int CtdlGetUser(struct ctdluser *usbuf, const char *name);
 int CtdlGetUserLock(struct ctdluser *usbuf, char *name);
 void CtdlPutUser(struct ctdluser *usbuf);
 void CtdlPutUserLock(struct ctdluser *usbuf);
@@ -315,7 +315,7 @@ void CtdlSetRelationship(struct visit *newvisit,
                         struct ctdlroom *rel_room);
 void CtdlMailboxName(char *buf, size_t n, const struct ctdluser *who, const char *prefix);
 
-int CtdlLoginExistingUser(char *authname, char *username);
+int CtdlLoginExistingUser(char *authname, const char *username);
 
 /*
  * Values which may be returned by CtdlLoginExistingUser()

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index 118ee60618459d4fc56efe2946c11781717e76cf..ee9e2ed1ebad2bce760fbe4d53175c40fa75cd89 100644 (file)
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -63,7 +63,7 @@ int chkpwd_read_pipe[2];
  * makeuserkey() - convert a username into the format used as a database key
  *              (it's just the username converted into lower case)
  */
-INLINE void makeuserkey(char *key, char *username) {
+INLINE void makeuserkey(char *key, const char *username) {
        int i, len;
 
        len = strlen(username);
@@ -72,7 +72,8 @@ INLINE void makeuserkey(char *key, char *username) {
                CtdlLogPrintf (CTDL_EMERG, "Username to long: %s", username);
                cit_backtrace ();
                len = USERNAME_SIZE - 1; 
-               username[USERNAME_SIZE - 1]='\0';
+               /* WHOOPSI! whats that??? todo. */
+               ((char*)username)[USERNAME_SIZE - 1]='\0';
        }
        for (i=0; i<=len; ++i) {
                key[i] = tolower(username[i]);
@@ -94,7 +95,7 @@ int getuser(struct ctdluser *usbuf, char name[])
  * CtdlGetUser()  -  retrieve named user into supplied buffer.
  *            returns 0 on success
  */
-int CtdlGetUser(struct ctdluser *usbuf, char name[])
+int CtdlGetUser(struct ctdluser *usbuf, const char *name)
 {
 
        char usernamekey[USERNAME_SIZE];
@@ -523,7 +524,7 @@ int getuserbyuid(struct ctdluser *usbuf, uid_t number)
  *
  * NOTE: "authname" should only be used if we are attempting to use the "master user" feature
  */
-int CtdlLoginExistingUser(char *authname, char *trythisname)
+int CtdlLoginExistingUser(char *authname, const char *trythisname)
 {
        char username[SIZ];
        int found_user;
@@ -1092,7 +1093,7 @@ int purge_user(char pname[])
 }
 
 
-int internal_create_user (char *username, struct ctdluser *usbuf, uid_t uid)
+int internal_create_user (const char *username, struct ctdluser *usbuf, uid_t uid)
 {
        if (!CtdlGetUser(usbuf, username)) {
                return (ERROR + ALREADY_EXISTS);
@@ -1133,7 +1134,7 @@ int internal_create_user (char *username, struct ctdluser *usbuf, uid_t uid)
  * Set 'become_user' to nonzero if this is self-service account creation and we want
  * to actually log in as the user we just created, otherwise set it to 0.
  */
-int create_user(char *newusername, int become_user)
+int create_user(const char *newusername, int become_user)
 {
        struct ctdluser usbuf;
        struct ctdlroom qrbuf;

diff --git a/citadel/user_ops.h b/citadel/user_ops.h
index 727c98cb33e758daafe50cb3b6d62a3a1fa22b8f..da50749d211edd57fa0cf16b278628abb1701a4b 100644 (file)
--- a/citadel/user_ops.h
+++ b/citadel/user_ops.h
@@ -19,7 +19,7 @@ void logged_in_response(void);
 /* logout() is deprecated use CtdlUserLogout() instead */
 void logout (void) __attribute__ ((deprecated));
 int purge_user (char *pname);
-int create_user (char *newusername, int become_user);
+int create_user (const char *newusername, int become_user);
 void do_login(void);
 int CtdlInvtKick(char *iuser, int op);
 void ForEachUser(void (*CallBack)(struct ctdluser *EachUser, void *out_data),
@@ -54,5 +54,5 @@ void start_chkpwd_daemon(void);
 #define RENAMEUSER_ALREADY_EXISTS      3       /* An account with the desired new name already exists */
 
 int rename_user(char *oldname, char *newname);
-INLINE void makeuserkey(char *key, char *username);
-int internal_create_user (char *username, struct ctdluser *usbuf, uid_t uid);
+INLINE void makeuserkey(char *key, const char *username);
+int internal_create_user (const char *username, struct ctdluser *usbuf, uid_t uid);