--- bluez-utils-2.25/hcid/hcid.conf.orig	2005-10-30 11:04:28 +1200

+++ bluez-utils-2.25/hcid/hcid.conf	2006-04-16 15:33:02 +1300

@@ -12,7 +12,7 @@

 	#   auto - Use local PIN for incoming connections

 	#   user - Always ask user for a PIN

 	#

-	security auto;

+	security user;

 	# Pairing mode

 	#   none  - Pairing disabled

@@ -21,7 +21,7 @@

 	pairing multi;

 	# PIN helper

-	pin_helper /usr/bin/bluepin;

+	pin_helper /etc/bluetooth/pin_helper;

 	# D-Bus PIN helper

 	#dbus_pin_helper;

@@ -32,7 +32,7 @@

 	# Local device name

 	#   %d - device id

 	#   %h - host name

-	name "BlueZ (%d)";

+	name "BlueZ (%h)";

 	# Local device class

 	class 0x3e0100;

@@ -48,7 +48,7 @@

 	#   accept - always accept incoming connections

 	#   master - become master on incoming connections,

 	#            deny role switch on outgoing connections

-	lm accept;

+	lm accept, master;

 	# Default link policy

 	#   none    - no specific policy

@@ -59,6 +59,6 @@

 	lp rswitch,hold,sniff,park;

 	# Authentication and Encryption (Security Mode 3)

-	#auth enable;

-	#encrypt enable;

+	auth enable;

+	encrypt enable;

 }