Change password for the Mac

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6845 dc483132-0cff-0310-8789-dd5450dbe970

6 files changed, 40 insertions, 13 deletions

diff --git a/src/lib/crypto/os/ChangeLog b/src/lib/crypto/os/ChangeLog
index e2cf90365..a23d04bb1 100644
--- a/src/lib/crypto/os/ChangeLog
+++ b/src/lib/crypto/os/ChangeLog
@@ -1,3 +1,8 @@
+Fri Sep 22 12:00:00 1995  James Mattly  <mattly@fusion.com>
+
+	* c_localaddr.c:  change close on a socket to closesocket, sockets on
+		macintosh arn't files
+
 Wed Sep 13 10:33:53 1995 Keith Vetter (keithv@fusion.com)
 
 	* Makefile.in: PC builds all C files because of function name changes.
diff --git a/src/lib/crypto/os/c_localaddr.c b/src/lib/crypto/os/c_localaddr.c
index 9bb03e4c9..af08c001a 100644
--- a/src/lib/crypto/os/c_localaddr.c
+++ b/src/lib/crypto/os/c_localaddr.c
@@ -216,7 +216,7 @@ n_found = 0;
 	    addr_temp[n_found++] = address;
 	address = 0;
     }
-    close(s);
+    closesocket(s);
 
     *addr = (krb5_address **)malloc (sizeof (krb5_address *) * (n_found+1));
     if (*addr == 0)
diff --git a/src/lib/kadm/ChangeLog b/src/lib/kadm/ChangeLog
index 5092e2a7b..eb0357eb1 100644
--- a/src/lib/kadm/ChangeLog
+++ b/src/lib/kadm/ChangeLog
@@ -1,3 +1,8 @@
+Fri Sep 22 12:00:00 1995  James Mattly  <mattly@fusion.com>
+
+	* adm_conn.c:  for sockets changed close to closesocket, sockets on
+		macintosh arn't files.
+
 Fri Sep 22 15:44:02 1995  Mark Eichin  <eichin@cygnus.com>
 
 	* logger.c (klog_com_err_proc): pass whoami in failure messages
diff --git a/src/lib/kadm/adm_conn.c b/src/lib/kadm/adm_conn.c
index 9de8e62ea..cb73e8aa2 100644
--- a/src/lib/kadm/adm_conn.c
+++ b/src/lib/kadm/adm_conn.c
@@ -429,7 +429,7 @@ kadm_contact_server(kcontext, realmp, sockp, local, remote)
 			sizeof(in_remote)) < 0) {
 		/* Failed, go to next address */
 		kret = SOCKET_ERRNO;
-		close(*sockp);
+		closesocket((SOCKET)*sockp);
 		*sockp = -1;
 		continue;
 	    }
@@ -508,7 +508,7 @@ kadm_contact_server(kcontext, realmp, sockp, local, remote)
 			    (struct sockaddr *) &in_remote,
 			    sizeof(in_remote)) < 0) {
 		    kret = SOCKET_ERRNO;
-		    close(*sockp);
+		    closesocket((SOCKET)*sockp);
 		    *sockp = -1;
 		    continue;
 		}
@@ -544,7 +544,7 @@ kadm_contact_server(kcontext, realmp, sockp, local, remote)
  cleanup:
     if (kret) {
 	if (*sockp >= 0)
-	    close(*sockp);
+	    closesocket((SOCKET)*sockp);
 	if (*local && (*local)->contents)
 	    free((*local)->contents);
 	if (*remote && (*remote)->contents)
@@ -713,7 +713,7 @@ krb5_adm_connect(kcontext, user, prompt, opassword, sockp, ctxp,
 	    *ctxp = (krb5_auth_context) NULL;
 	}
 	if (*sockp >= 0) {
-	    close(*sockp);
+	    closesocket((SOCKET)*sockp);
 	    *sockp = -1;
 	}
 	if (local_addr && local_addr->contents)
@@ -755,6 +755,6 @@ krb5_adm_disconnect(kcontext, socketp, auth_context, ccache)
     if (auth_context)
 	krb5_xfree(auth_context);
     if (*socketp >= 0)
-	close(*socketp);
+	closesocket((SOCKET)*socketp);
 }
 
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 3f06ad019..cc5d543a2 100644
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -3,6 +3,11 @@ Fri Sep 22 15:57:33 1995  Mark Eichin  <eichin@cygnus.com>
 	* write_msg.c (krb5_write_message): check the real length
 	variable, not the net version.
 
+Wed Sep 20 12:00:00 1995  James Mattly  <mattly@fusion.com>
+
+	* macsock.c:  Added TCP streams to the emulation package.  gethostname
+		now no longer returns true cannonical hostnames.
+
 Wed Sep 13 11:01:18 1995 Keith Vetter (keithv@fusion.com)
 
 	* Makefile.in: had to define away DBFLAGS for the PC.
diff --git a/src/lib/krb5/os/macsock.c b/src/lib/krb5/os/macsock.c
index 8fcf4c716..523d4e218 100644
--- a/src/lib/krb5/os/macsock.c
+++ b/src/lib/krb5/os/macsock.c
@@ -164,10 +164,11 @@ socket(af, type, protocol)
 		break;
 
 	case SOCK_STREAM:
+		memset((char *) &pb, '\0', sizeof(pb));	
 		pb.tcppb.ioCRefNum = theUDP->fMacTCPRef;
 		pb.tcppb.csCode = TCPCreate;
 		pb.tcppb.csParam.create.rcvBuff = theUDP->fRecvBuf;
-		pb.tcppb.csParam.create.rcvBuffLen = UDPbuflen;
+		pb.tcppb.csParam.create.rcvBuffLen = TCPbuflen;
 		pb.tcppb.csParam.create.notifyProc = NULL;
 		err = PBControl((ParamBlockRec *)&pb,false);
 		if (err) {
@@ -176,7 +177,7 @@ socket(af, type, protocol)
 			return INVALID_SOCKET;
 		}
 		theUDP->fStream = (unsigned long)pb.tcppb.tcpStream;
-	
+
 		theUDP->connect_addr.sin_family = 0;
 		theUDP->connect_addr.sin_port = 0;
 		theUDP->connect_addr.sin_addr.s_addr = 0;
@@ -399,21 +400,25 @@ connect (s, addr, tolen)
 	case SOCK_DGRAM:
 		break;
 	case SOCK_STREAM:
+		memset((char *) &pb, '\0', sizeof(pb));	
 		pb.tcppb.ioCRefNum = s->fMacTCPRef;
 		pb.tcppb.csCode = TCPActiveOpen;
-		pb.tcppb.csParam.open.validityFlags = timeoutValue | timeoutAction;
-		pb.tcppb.csParam.open.ulpTimeoutValue = 60 /* seconds */;
+		pb.tcppb.tcpStream = s->fStream;
+		pb.tcppb.csParam.open.ulpTimeoutValue = 15 /* seconds */;
 		pb.tcppb.csParam.open.ulpTimeoutAction = 1 /* 1:abort 0:report */;
-		pb.tcppb.csParam.open.commandTimeoutValue = 0;
+		pb.tcppb.csParam.open.validityFlags = timeoutValue | timeoutAction;
+		pb.tcppb.csParam.open.commandTimeoutValue = 0;		/* jfm timeout in 0 secs ? */
 		pb.tcppb.csParam.open.remoteHost = addr->sin_addr.s_addr;
 		pb.tcppb.csParam.open.remotePort = addr->sin_port;
 		pb.tcppb.csParam.open.localHost = 0;
 		pb.tcppb.csParam.open.localPort = 0; /* we'll get the port back later */
+		pb.tcppb.csParam.open.tosFlags = 0;	/* jfm ? */
+		pb.tcppb.csParam.open.precedence = 0;	/* jfm ? */
 		pb.tcppb.csParam.open.dontFrag = 0;
 		pb.tcppb.csParam.open.timeToLive = 0;
 		pb.tcppb.csParam.open.security = 0;
 		pb.tcppb.csParam.open.optionCnt = 0;
-		pb.tcppb.tcpStream = s->fStream;
+		pb.tcppb.csParam.open.userDataPtr = 0;	/* jfm */
 		err = PBControl((ParamBlockRec *)&pb.tcppb,false);
 		if (err) {
 			SOCKET_SET_ERRNO (EINVAL);
@@ -615,6 +620,13 @@ gethostbyaddr (char *addr, int len, int type)
 		return 0;
 		}
 
+	/* take off a period from the end of the connonical host name */
+	{
+	int hostnamelen = strlen(host.cname);
+		if (host.cname[hostnamelen-1] == '.')
+			host.cname[hostnamelen-1] = 0;
+	}
+
 	/* Build result in hostent structure, which we will return to caller.  */
 	
 	result.h_name = host.cname;
@@ -665,7 +677,7 @@ getmyipaddr ()
 	result.h_addrtype = AF_INET;
 	result.h_length = sizeof (host.addr[0]);  /* Length of each address */
 	result.h_addr_list = ipaddr_ptrs;
-	ipaddr_ptrs[0] = (char*) ourAddr.s_addr;
+	ipaddr_ptrs[0] = (char*) &ourAddr.s_addr;	/* h_addr_list is a pointer to a list of pointers... */
 	ipaddr_ptrs[1] = 0;
 
 	closesocket (sock);