From owner-freebsd-current@FreeBSD.ORG Sat Jun 12 23:30:04 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D3B2A1065676 for ; Sat, 12 Jun 2010 23:30:04 +0000 (UTC) (envelope-from freebsd-current@m.gmane.org) Received: from lo.gmane.org (lo.gmane.org [80.91.229.12]) by mx1.freebsd.org (Postfix) with ESMTP id 598298FC0A for ; Sat, 12 Jun 2010 23:30:04 +0000 (UTC) Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1ONa9F-0003kS-El for freebsd-current@freebsd.org; Sun, 13 Jun 2010 01:29:57 +0200 Received: from k.saper.info ([91.121.151.35]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 13 Jun 2010 01:29:57 +0200 Received: from saper by k.saper.info with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 13 Jun 2010 01:29:57 +0200 X-Injected-Via-Gmane: http://gmane.org/ To: freebsd-current@freebsd.org connect(): No such file or directory From: Marcin Cieslak Date: Sat, 12 Jun 2010 23:29:47 +0000 (UTC) Organization: http://saper.info Lines: 85 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: k.saper.info User-Agent: slrn/0.9.9p1 (FreeBSD) X-Mailman-Approved-At: Sun, 13 Jun 2010 00:24:07 +0000 Cc: heimdal-discuss@sics.se Subject: Re: Our aging base system heimdal X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jun 2010 23:30:04 -0000 (from the freebsd-current mailing list) Dnia 06.06.2010 b. f. napisał/a: > Is anybody planning to update the base system heimdal, which has been > largely untouched since May 2008? In addition to the many other > bug-fixes and improvements in the current version 1.3.3 (see, for > example: I decided to give it a try. My first steup is to make it compile on FreeBSD. As you know, as of recently FreeBSD-current has no I have hacked up a small patch to fix this: --- appl/ftp/ftpd/logwtmp.c 2010-05-26 23:53:13.000000000 +0200 +++ appl/ftp/ftpd/logwtmp.c 2010-06-12 22:32:57.373647840 +0200 @@ -104,16 +104,16 @@ static void ftpd_logwtmp_wtmp(char *line, char *name, char *host) { +#ifdef HAVE_UTMP_H static int init = 0; static int fd; -#ifdef WTMPX_FILE - static int fdx; -#endif struct utmp ut; -#ifdef WTMPX_FILE +#endif +#ifdef HAVE_UTMPX_H struct utmpx utx; #endif +#ifdef HAVE_UTMP_H memset(&ut, 0, sizeof(struct utmp)); #ifdef HAVE_STRUCT_UTMP_UT_TYPE if(name[0]) @@ -130,8 +130,9 @@ strncpy(ut.ut_host, host, sizeof(ut.ut_host)); #endif ut.ut_time = time(NULL); +#endif -#ifdef WTMPX_FILE +#ifdef HAVE_UTMPX_H strncpy(utx.ut_line, line, sizeof(utx.ut_line)); strncpy(utx.ut_user, name, sizeof(utx.ut_user)); strncpy(utx.ut_host, host, sizeof(utx.ut_host)); @@ -140,6 +141,7 @@ if (utx.ut_syslen > sizeof(utx.ut_host)) utx.ut_syslen = sizeof(utx.ut_host); #endif +#endif { struct timeval tv; @@ -152,21 +154,18 @@ utx.ut_type = USER_PROCESS; else utx.ut_type = DEAD_PROCESS; -#endif +#ifdef HAVE_UTMPX_H + pututxline(&utx); +#else if(!init){ fd = open(WTMP_FILE, O_WRONLY|O_APPEND, 0); -#ifdef WTMPX_FILE - fdx = open(WTMPX_FILE, O_WRONLY|O_APPEND, 0); -#endif init = 1; } if(fd >= 0) { write(fd, &ut, sizeof(struct utmp)); /* XXX */ -#ifdef WTMPX_FILE - write(fdx, &utx, sizeof(struct utmpx)); -#endif } +#endif } #endif /* !HAVE_ASL_H */ -- << Marcin Cieslak // saper@saper.info >>