From 5db95e87090605303fac2b290c2d3177366e049b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C5=A1per=20Fele-=C5=BDor=C5=BE?= <polz@fri.uni-lj.si>
Date: Thu, 11 Sep 2025 13:15:49 +0200
Subject: [PATCH] Enable common homes between Windows and Ubuntu

---
 roles/ad_joined/files/pam_mount.conf.xml | 10 +++++-----
 roles/ad_joined/templates/sssd.conf      |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/roles/ad_joined/files/pam_mount.conf.xml b/roles/ad_joined/files/pam_mount.conf.xml
index 24167bc..a6d8570 100644
--- a/roles/ad_joined/files/pam_mount.conf.xml
+++ b/roles/ad_joined/files/pam_mount.conf.xml
@@ -7,7 +7,7 @@
   <volume
       fstype="cifs"
       server="ucilnicesmb.fri1.uni-lj.si"
-      path="%(USER)"
+      path="profiles/%(DOMAIN_USER).%(DOMAIN_NAME)"
       mountpoint="~/"
       options="sec=krb5i,cruid=%(USERUID)"
   >
@@ -15,11 +15,11 @@
       <or>
         <user>local_admin</user>
         <user>root</user>
-        <sgrp>sudo</sgrp>
+        <sgrp>users</sgrp>
       </or>
     </not>
   </volume>
-  <volume
+  <!-- <volume
       fstype="cifs"
       server="ucilnicesmb.fri1.uni-lj.si"
       path="profiles/%(DOMAIN_USER).V6"
@@ -30,8 +30,8 @@
       <or>
         <user>local_admin</user>
         <user>root</user>
-        <sgrp>sudo</sgrp>
+        <sgrp>users</sgrp>
       </or>
     </not>
-  </volume>
+  </volume> -->
 </pam_mount>
diff --git a/roles/ad_joined/templates/sssd.conf b/roles/ad_joined/templates/sssd.conf
index 248f402..e69948b 100644
--- a/roles/ad_joined/templates/sssd.conf
+++ b/roles/ad_joined/templates/sssd.conf
@@ -28,6 +28,7 @@ krb5_store_password_if_offline = True
 default_shell = /bin/bash
 ldap_id_mapping = True
 use_fully_qualified_names = True
+full_name_format = %1$s@%3$s
 fallback_homedir = /home/%u@%d
 access_provider = ad
 krb5_ccname_template = FILE:%d/krb5cc_%U