r6070: Fix typo's and fallback to "" as default user name if no

other username could be guessed.
(This used to be commit 7fe77cd65901776b5a78e8398547f364379259d3)

diff --git a/source4/lib/credentials.c b/source4/lib/credentials.c
index da0bc4236fdfb15dcc1c18b3a0716f9cbde5ddb8..167650f8c244146d44627016adc7339b5f7fc43e 100644 (file)
--- a/source4/lib/credentials.c
+++ b/source4/lib/credentials.c
@@ -29,7 +29,7 @@
 /* Create a new credentials structure, on the specified TALLOC_CTX */
 struct cli_credentials *cli_credentials_init(TALLOC_CTX *mem_ctx) 
 {
-       struct cli_credentails *cred = talloc_zero(mem_ctx, struct cli_credentials);
+       struct cli_credentials *cred = talloc_zero(mem_ctx, struct cli_credentials);
        if (!cred) {
                return cred;
        }
@@ -311,6 +311,7 @@ void cli_credentials_guess(struct cli_credentials *cred)
 {
        char *p;
 
+       cli_credentials_set_username(cred, "", CRED_GUESSED);
        cli_credentials_set_conf(cred);
        
        if (getenv("LOGNAME")) {
@@ -455,7 +456,7 @@ BOOL cli_credentials_is_anonymous(struct cli_credentials *cred)
        const char *username = cli_credentials_get_username(cred);
 
        /* Yes, it is deliberate that we die if we have a NULL pointer
-        * here - anymous is "", not NULL, which is 'never specified,
+        * here - anonymous is "", not NULL, which is 'never specified,
         * never guessed', ie programmer bug */
        if (!username[0]) 
                return True;

diff --git a/source4/lib/socket/socket_unix.c b/source4/lib/socket/socket_unix.c
index 7cf12db4b2e503153338941c0311b3fb81f22e32..614229aaac313f260b2772d08c7911ba75a3b512 100644 (file)
--- a/source4/lib/socket/socket_unix.c
+++ b/source4/lib/socket/socket_unix.c
@@ -23,7 +23,6 @@
 
 #include "includes.h"
 #include "lib/socket/socket.h"
-#include "lib/socket/socket.h"
 #include "system/network.h"
 #include "system/filesys.h"