steffen: server/kolab/kolab kolab_bootstrap,1.62,1.63

cvs at intevation.de cvs at intevation.de
Wed Sep 8 15:33:05 CEST 2004


Author: steffen

Update of /kolabrepository/server/kolab/kolab
In directory doto:/tmp/cvs-serv30814/kolab

Modified Files:
	kolab_bootstrap 
Log Message:
that hostname thing was annoying...

Index: kolab_bootstrap
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/kolab_bootstrap,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- kolab_bootstrap	7 Sep 2004 12:48:55 -0000	1.62
+++ kolab_bootstrap	8 Sep 2004 13:33:03 -0000	1.63
@@ -33,6 +33,20 @@
 
 ##### Utility Functions
 
+# Try to get fqdn
+sub myhostname {
+  my $host = '';
+  if( open( HOSTNAME, '/etc/HOSTNAME' ) ) {
+    $host = <HOSTNAME>;
+    chomp $host;
+    close( HOSTNAME );
+  }
+  if( $host eq '' ) {
+    $host = `hostname`;
+  }
+  return $host;
+}
+
 # Connect to host,port and return 1 on success
 sub tryConnect {
   my $host  = shift;
@@ -213,7 +227,7 @@
 }
 my $fqdn;
 if( $fqdnhostname =~ /\@\@\@/ ) {
-  $fqdn = `hostname`;
+  $fqdn = myhostname;
 } else {
   $fqdn = $fqdnhostname;
 }





More information about the commits mailing list